Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31303
Modified Files: Tag: desiredata configure.in configure makefile.in Log Message: even more like 0.40
Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.11 retrieving revision 1.4.4.2.2.21.2.12 diff -C2 -d -r1.4.4.2.2.21.2.11 -r1.4.4.2.2.21.2.12 *** makefile.in 8 Dec 2006 18:31:31 -0000 1.4.4.2.2.21.2.11 --- makefile.in 8 Dec 2006 19:11:25 -0000 1.4.4.2.2.21.2.12 *************** *** 1,9 **** EXT= @EXT@ LIBSUFFIX = @LIBSUFFIX@ ! INSTALL_PREFIX = @prefix@ bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ mandir = @mandir@
MORECFLAGS = @MORECFLAGS@ --- 1,15 ---- EXT= @EXT@ LIBSUFFIX = @LIBSUFFIX@ ! prefix = @prefix@ ! exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ mandir = @mandir@ + # varibles to match packages/Makefile.buildlayout so that they can be easily + # overridden when building Pd-extended builds. hans@at.or.at + libpddir = $(libdir)/pd + pddocdir = $(libpddir)/doc + libpdbindir = $(libpddir)/bin
MORECFLAGS = @MORECFLAGS@ *************** *** 13,17 **** CFLAGS = $(CPPFLAGS) @CFLAGS@ $(MORECFLAGS) CFLAGS += -Wall -Wno-unused-parameter -I. ! CFLAGS += -DINSTALL_PREFIX="$(INSTALL_PREFIX)"
# from DesireData (matju & chun) --- 19,23 ---- CFLAGS = $(CPPFLAGS) @CFLAGS@ $(MORECFLAGS) CFLAGS += -Wall -Wno-unused-parameter -I. ! CFLAGS += -DINSTALL_PREFIX="$(prefix)"
# from DesireData (matju & chun) *************** *** 70,98 **** cd $$ext; make @EXTERNTARGET@ || break; cd ..; done
- #INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) - INSTDIR = $(INSTALL_PREFIX) - install: all ! install -d $(INSTDIR)/bin ! install -d $(INSTDIR)/lib/pd/bin for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \ ! install $$file $(INSTDIR)/lib/pd/bin/$$file; done ! cp -r locale $(INSTDIR)/lib/pd/bin ! cp -r ../icons $(INSTDIR)/lib/pd ! install $(BINARYMODE) $(SO) $(INSTDIR)/lib/$(SO) test -w /etc/ld.so.cache && ldconfig || true ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -lpd main.c -o $(INSTDIR)/bin/pd ! install -m755 desire.tk $(INSTDIR)/bin/desire ! install -m755 pdsend $(INSTDIR)/bin/pdsend ! install -m755 pdreceive $(INSTDIR)/bin/pdreceive ! install -m755 pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog ! cp -pr ../doc ../extra $(INSTDIR)/lib/pd/ ! rm -f $(INSTDIR)/extra/*/*.o ! install -d $(INSTDIR)/include ! install -m644 m_pd.h $(INSTDIR)/include/m_pd.h ! install -m644 desire.h $(INSTDIR)/include/desire.h ! install -d $(INSTDIR)$(mandir)/man1 for page in pd.1 pdsend.1 pdreceive.1; do \ ! gzip < ../man/$$page > $(INSTDIR)$(mandir)/man1/$$page.gz; chmod 644 $(INSTDIR)$(mandir)/man1/$$page.gz; done
local-clean: --- 76,101 ---- cd $$ext; make @EXTERNTARGET@ || break; cd ..; done
install: all ! install -d $(DESTDIR)$(bindir) ! install -d $(DESTDIR)$(libpdbindir) for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \ ! install $$file $(DESTDIR)$(libpdbindir)/$$file; done ! cp -r locale $(DESTDIR)$(libpdbindir) ! cp -r ../icons $(DESTDIR)$(libpddir) ! install $(BINARYMODE) $(SO) $(DESTDIR)$(libdir)/$(SO) test -w /etc/ld.so.cache && ldconfig || true ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -lpd main.c -o $(DESTDIR)$(bindir)/pd ! install -m755 desire.tk $(DESTDIR)$(bindir)/desire ! install -m755 pdsend $(DESTDIR)$(bindir)/pdsend ! install -m755 pdreceive $(DESTDIR)$(bindir)/pdreceive ! install -m755 pd-watchdog $(DESTDIR)$(libpdbindir)/pd-watchdog ! cp -pr ../doc/* $(DESTDIR)$(pddocdir) ! cp -pr ../extra/* $(DESTDIR)$(libpddir) ! # rm -f $(DESTDIR)$(libpddir)/extra/*/*.o ! install -d $(DESTDIR)$(includedir) ! for file in m_pd.h desire.h; do install -m644 $$file $(DESTDIR)$(includedir)/$$file; done ! install -d $(DESTDIR)$(mandir)/man1 for page in pd.1 pdsend.1 pdreceive.1; do \ ! gzip < ../man/$$page > $(DESTDIR)$(mandir)/man1/$$page.gz; chmod 644 $(DESTDIR)$(mandir)/man1/$$page.gz; done
local-clean: *************** *** 124,137 ****
uninstall: ! rm -f -r $(INSTDIR)/lib/pd ! rm -f $(INSTDIR)/bin/pd ! rm -f $(INSTDIR)/bin/pdsend ! rm -f $(INSTDIR)/bin/pdreceive ! rm -f $(INSTDIR)/d/m_pd.h ! rm -f $(MANINSTDIR)/man1/pd.1.gz ! rm -f $(MANINSTDIR)/man1/pdsend.1.gz ! rm -f $(MANINSTDIR)/man1/pdreceive.1.gz
include makefile.deps
! # echo $$LD_LIBRARY_PATH | sed 's/:/\n/g' | grep -q '^$(INSTDIR)$$' --- 127,137 ----
uninstall: ! rm -f -r $(DESTDIR)$(libpddir) ! rm -f $(DESTDIR)$(libdir)/libpd* ! cd $(DESTDIR)$(bindir); rm pd pdsend pdreceive ! cd $(DESTDIR)$(includedir); rm m_pd.h desire.h ! cd $(DESTDIR)$(mandir)/man1; rm pd.1.gz pdsend.1.gz pdreceive.1.gz
include makefile.deps
! # echo $$LD_LIBRARY_PATH | sed 's/:/\n/g' | grep -q '^$(DESTDIR)$(libdir)$$'
Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.14.2.7 retrieving revision 1.6.2.14.2.8 diff -C2 -d -r1.6.2.14.2.7 -r1.6.2.14.2.8 *** configure 8 Dec 2006 18:31:31 -0000 1.6.2.14.2.7 --- configure 8 Dec 2006 19:11:25 -0000 1.6.2.14.2.8 *************** *** 4337,4341 **** # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" --- 4337,4342 ---- # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.16.2.9 retrieving revision 1.5.4.5.2.16.2.10 diff -C2 -d -r1.5.4.5.2.16.2.9 -r1.5.4.5.2.16.2.10 *** configure.in 8 Dec 2006 18:31:31 -0000 1.5.4.5.2.16.2.9 --- configure.in 8 Dec 2006 19:11:25 -0000 1.5.4.5.2.16.2.10 *************** *** 87,91 **** # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" --- 87,92 ---- # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"