Update of /cvsroot/pure-data/packages/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32078/patches
Modified Files: build_vars_4_makefile.in.patch Log Message:
- finally got a Linux Pd-extended release out, RC5
- built a tar.bz2 package maker with a generated Makefile for installing and uninstalling
- switched all Makefiles to follow GNU $(DESTDIR)/$(prefix) standards
Index: build_vars_4_makefile.in.patch =================================================================== RCS file: /cvsroot/pure-data/packages/patches/build_vars_4_makefile.in.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build_vars_4_makefile.in.patch 26 Nov 2005 04:18:52 -0000 1.2 --- build_vars_4_makefile.in.patch 28 Nov 2005 06:46:18 -0000 1.3 *************** *** 5,10 **** diff -u -w -r1.5 makefile.in --- makefile.in 6 Nov 2004 16:07:33 -0000 1.5 ! +++ makefile.in 26 Nov 2005 04:06:12 -0000 ! @@ -5,8 +5,8 @@ EXT= @EXT@ GUINAME= @GUINAME@ --- 5,10 ---- diff -u -w -r1.5 makefile.in --- makefile.in 6 Nov 2004 16:07:33 -0000 1.5 ! +++ makefile.in 28 Nov 2005 06:37:05 -0000 ! @@ -5,10 +5,20 @@ EXT= @EXT@ GUINAME= @GUINAME@ *************** *** 12,21 **** -INSTALL_PREFIX = @prefix@ -GFLAGS = -DINSTALL_PREFIX="$(INSTALL_PREFIX)" +prefix = @prefix@ +GFLAGS = -DINSTALL_PREFIX="$(prefix)"
! MANDIR = @mandir@
! @@ -112,30 +112,49 @@ cd ../extra/lrshift~;make @EXTERNTARGET@ cd ../extra/pique;make @EXTERNTARGET@ --- 12,35 ---- -INSTALL_PREFIX = @prefix@ -GFLAGS = -DINSTALL_PREFIX="$(INSTALL_PREFIX)" + - + -MANDIR = @mandir@ +prefix = @prefix@ + +exec_prefix = @exec_prefix@ + +bindir = @bindir@ + +includedir = @includedir@ + +libdir = @libdir@ + +mandir = @mandir@ + + +GFLAGS = -DINSTALL_PREFIX="$(prefix)" + + + +# 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@
! @@ -112,30 +122,39 @@ cd ../extra/lrshift~;make @EXTERNTARGET@ cd ../extra/pique;make @EXTERNTARGET@ *************** *** 23,38 **** -INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) -MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR) - +INSTDIR = $(DESTDIR)$(prefix) BINARYMODE=@binarymode@
- +# varibles to match packages/Makefile.buildlayout so that they can be easily - +# overridden when building extended builds. hans@at.or.at - +bindir = $(INSTDIR)/bin - +pddocdir = $(INSTDIR)/doc - +includedir = $(INSTDIR)/include - +libpddir = $(INSTDIR)/lib/pd - +libpdbindir = $(libpddir)/bin - +mandir = $(DESTDIR)$(MANDIR) - + install: all - install -d $(INSTDIR)/lib/pd/bin --- 37,42 ---- *************** *** 45,68 **** - install -m755 $(BIN_DIR)/pdreceive $(INSTDIR)/bin/pdreceive - cp -pr ../doc ../extra $(INSTDIR)/lib/pd/ ! + install -d $(libpdbindir) ! + install $(BIN_DIR)/$(GUINAME) $(libpdbindir)/$(GUINAME) ! + install $(BIN_DIR)/pd-watchdog $(libpdbindir)/pd-watchdog ! + install -m644 $(BIN_DIR)/pd.tk $(libpdbindir)/pd.tk ! + install -d $(bindir) ! + install $(BINARYMODE) $(PDEXEC) $(bindir)/pd ! + install -m755 $(BIN_DIR)/pdsend $(bindir)/pdsend ! + install -m755 $(BIN_DIR)/pdreceive $(bindir)/pdreceive ! + for dir in $(shell ls -1 ../doc | grep -v CVS); do \ ! + echo "installing $$dir"; \ ! + install -d $(pddocdir)/$$dir ; \ ! + install -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \ ! + done ! + for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \ ! + echo "installing 7.stuff/$$dir"; \ ! + install -d $(pddocdir)/7.stuff/$$dir ; \ ! + install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \ ! + done ! + cp -pr ../extra $(libpddir)/ ! rm -f $(INSTDIR)/extra/*/*.o - install -d $(INSTDIR)/include - install -m644 m_pd.h $(INSTDIR)/include/m_pd.h --- 49,53 ---- - install -m755 $(BIN_DIR)/pdreceive $(INSTDIR)/bin/pdreceive - 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 *************** *** 74,86 **** - gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz - chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz ! + install -d $(includedir) ! + install -m644 m_pd.h $(includedir)/m_pd.h ! + install -d $(mandir)/man1 ! + gzip < ../man/pd.1 > $(mandir)/man1/pd.1.gz ! + chmod 644 $(mandir)/man1/pd.1.gz ! + gzip < ../man/pdsend.1 > $(mandir)/man1/pdsend.1.gz ! + chmod 644 $(mandir)/man1/pdsend.1.gz ! + gzip < ../man/pdreceive.1 > $(mandir)/man1/pdreceive.1.gz ! + chmod 644 $(mandir)/man1/pdreceive.1.gz + @echo "Pd install succeeded."
--- 59,91 ---- - gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz - chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz ! + install -d $(DESTDIR)$(libpdbindir) ! + install $(BIN_DIR)/$(GUINAME) $(DESTDIR)$(libpdbindir)/$(GUINAME) ! + install $(BIN_DIR)/pd-watchdog $(DESTDIR)$(libpdbindir)/pd-watchdog ! + install -m644 $(BIN_DIR)/pd.tk $(DESTDIR)$(libpdbindir)/pd.tk ! + install -d $(DESTDIR)$(bindir) ! + install $(BINARYMODE) $(PDEXEC) $(DESTDIR)$(bindir)/pd ! + install -m755 $(BIN_DIR)/pdsend $(DESTDIR)$(bindir)/pdsend ! + install -m755 $(BIN_DIR)/pdreceive $(DESTDIR)$(bindir)/pdreceive ! + for dir in $(shell ls -1 ../doc | grep -v CVS); do \ ! + echo "installing $$dir"; \ ! + install -d $(DESTDIR)$(pddocdir)/$$dir ; \ ! + install -p ../doc/$$dir/*.* $(DESTDIR)$(pddocdir)/$$dir ; \ ! + done ! + for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \ ! + echo "installing 7.stuff/$$dir"; \ ! + install -d $(DESTDIR)$(pddocdir)/7.stuff/$$dir ; \ ! + install -p ../doc/7.stuff/$$dir/*.* $(DESTDIR)$(pddocdir)/7.stuff/$$dir ; \ ! + done ! + cp -pr ../extra $(DESTDIR)$(libpddir)/ ! + rm -f $(DESTDIR)$(libpddir)/extra/*/*.o ! + install -d $(DESTDIR)$(includedir) ! + install -m644 m_pd.h $(DESTDIR)$(includedir)/m_pd.h ! + install -d $(DESTDIR)$(mandir)/man1 ! + gzip < ../man/pd.1 > $(DESTDIR)$(mandir)/man1/pd.1.gz ! + chmod 644 $(DESTDIR)$(mandir)/man1/pd.1.gz ! + gzip < ../man/pdsend.1 > $(DESTDIR)$(mandir)/man1/pdsend.1.gz ! + chmod 644 $(DESTDIR)$(mandir)/man1/pdsend.1.gz ! + gzip < ../man/pdreceive.1 > $(DESTDIR)$(mandir)/man1/pdreceive.1.gz ! + chmod 644 $(DESTDIR)$(mandir)/man1/pdreceive.1.gz + @echo "Pd install succeeded."