are there any objections to commit the attached patch to pd-devel?
the stuff that goes installed into */lib were left outside DESTDIR that would produce a bad staged install, cause some files get left outside the DESTDIR (which is fundamental to packagers, and distros like Gentoo)
it affects the destination path of $(libpddir), $(libpdbindir) $(pddocdir), by prefixing it with $(DESTDIR)
Index: makefile.in =================================================================== --- makefile.in (revision 10466) +++ makefile.in (working copy) @@ -161,32 +161,32 @@
BINARYMODE=@binarymode@
-ABOUT_FILE=$(pddocdir)/1.manual/1.introduction.txt +ABOUT_FILE=$(DESTDIR)$(pddocdir)/1.manual/1.introduction.txt install: all - 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 $(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 $(pddocdir)/$$dir ; \ - install -m644 -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \ + install -d $(DESTDIR)$(pddocdir)/$$dir ; \ + install -m644 -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 $(pddocdir)/7.stuff/$$dir ; \ - install -m644 -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \ + install -d $(DESTDIR)$(pddocdir)/7.stuff/$$dir ; \ + install -m644 -p ../doc/7.stuff/$$dir/*.* $(DESTDIR)$(pddocdir)/7.stuff/$$dir ; \ done mv $(ABOUT_FILE) $(ABOUT_FILE).tmp cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_VERSION)|' \ > $(ABOUT_FILE) rm $(ABOUT_FILE).tmp - cp -pr ../extra $(libpddir)/ - rm -f $(libpddir)/extra/*/*.o + 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 @@ -228,7 +228,7 @@ $(CC) $(CPPFLAGS) -M $(SRC) > makefile.dependencies
uninstall: - rm -f -r $(libpddir) + rm -f -r $(DESTDIR)$(libpddir) rm -f $(DESTDIR)$(bindir)/pd rm -f $(DESTDIR)$(bindir)/pdsend rm -f $(DESTDIR)$(bindir)/pdreceive
Before we start modifying any specific file in pd-devel, I think there needs to be a plan for how those changes are going to maintained, IMHO. I don't think pd-devel is an outright fork (yet?) so its too soon to just start committing things without this discussion about how it will related to pd-vanilla.
So far, we've talked a lot about u_main.tk, and that's what we've been working on. And by the way, IIRC, the DESTDIR changes are in the pd- extended branch, and submitted to the patch tracker.
.hc
On Dec 27, 2008, at 12:23 PM, mescalinum@gmail.com wrote:
are there any objections to commit the attached patch to pd-devel?
the stuff that goes installed into */lib were left outside DESTDIR that would produce a bad staged install, cause some files get left outside the DESTDIR (which is fundamental to packagers, and distros like Gentoo)
it affects the destination path of $(libpddir), $(libpdbindir) $(pddocdir), by prefixing it with $(DESTDIR) Index: makefile.in =================================================================== --- makefile.in (revision 10466) +++ makefile.in (working copy) @@ -161,32 +161,32 @@
BINARYMODE=@binarymode@
-ABOUT_FILE=$(pddocdir)/1.manual/1.introduction.txt +ABOUT_FILE=$(DESTDIR)$(pddocdir)/1.manual/1.introduction.txt install: all
- 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 $(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 $(pddocdir)/$$dir ; \
install -m644 -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \
install -d $(DESTDIR)$(pddocdir)/$$dir ; \
done for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \ echo "installing 7.stuff/$$dir"; \install -m644 -p ../doc/$$dir/*.* $(DESTDIR)$(pddocdir)/$$dir ; \
install -d $(pddocdir)/7.stuff/$$dir ; \
install -m644 -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$
$dir ; \
install -d $(DESTDIR)$(pddocdir)/7.stuff/$$dir ; \
install -m644 -p ../doc/7.stuff/$$dir/*.* $(DESTDIR)$(pddocdir)/
7.stuff/$$dir ; \ done mv $(ABOUT_FILE) $(ABOUT_FILE).tmp cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $ (PD_VERSION)|' \ > $(ABOUT_FILE) rm $(ABOUT_FILE).tmp
- cp -pr ../extra $(libpddir)/
- rm -f $(libpddir)/extra/*/*.o
- 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
@@ -228,7 +228,7 @@ $(CC) $(CPPFLAGS) -M $(SRC) > makefile.dependencies
uninstall:
- rm -f -r $(libpddir)
- rm -f -r $(DESTDIR)$(libpddir) rm -f $(DESTDIR)$(bindir)/pd rm -f $(DESTDIR)$(bindir)/pdsend rm -f $(DESTDIR)$(bindir)/pdreceive
<signature.asc>_______________________________________________ Pd-dev mailing list Pd-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
Hans-Christoph Steiner wrote:
Before we start modifying any specific file in pd-devel, I think there needs to be a plan for how those changes are going to maintained, IMHO.
yep, that makes sense. it's well to discuss about it, since it's always good to bring improvements to software.
if I remember correct, I tried submitting those DESTDIR fixes time ago, also to pd-vanilla, but perhaps it found no interest. let's put it into this way:
why some files (everything under $prefix/lib it seems) need to get installed outside $DESTDIR?
actually almost no-one notices this problem when installing pd directly to / (which is, when you specify no DESTDIR to make). but when you want to install files in some path (example: for packaging pd), you end up having a DESTDIR which contains bin files, but not library files, which get installed to the real root /) so the build system it's not fully functional (it has to be regularly patched to install correctly on Gentoo, as I said)
So far, we've talked a lot about u_main.tk, and that's what we've been working on. And by the way, IIRC, the DESTDIR changes are in the pd-extended branch, and submitted to the patch tracker.
yep I followed the discussion and despite I'm really busy with life, work and study, I'm really happy this is happening, and I wish to contribute to pd ui (I have some idea for improved widgets and also for the ui design)
Looks like I already took a "DESTDIR" patch sometime in the past, and the present one merely makes it more nearly correct -- so I just hand-adapted it into vanilla. (new test release hopefully to arrive tomorrow once I've tested it on the usual machines)
cheers Miller
On Sun, Dec 28, 2008 at 05:02:53PM +0100, mescalinum@gmail.com wrote:
Hans-Christoph Steiner wrote:
Before we start modifying any specific file in pd-devel, I think there needs to be a plan for how those changes are going to maintained, IMHO.
yep, that makes sense. it's well to discuss about it, since it's always good to bring improvements to software.
if I remember correct, I tried submitting those DESTDIR fixes time ago, also to pd-vanilla, but perhaps it found no interest. let's put it into this way:
why some files (everything under $prefix/lib it seems) need to get installed outside $DESTDIR?
actually almost no-one notices this problem when installing pd directly to / (which is, when you specify no DESTDIR to make). but when you want to install files in some path (example: for packaging pd), you end up having a DESTDIR which contains bin files, but not library files, which get installed to the real root /) so the build system it's not fully functional (it has to be regularly patched to install correctly on Gentoo, as I said)
So far, we've talked a lot about u_main.tk, and that's what we've been working on. And by the way, IIRC, the DESTDIR changes are in the pd-extended branch, and submitted to the patch tracker.
yep I followed the discussion and despite I'm really busy with life, work and study, I'm really happy this is happening, and I wish to contribute to pd ui (I have some idea for improved widgets and also for the ui design)
-- FF
Pd-dev mailing list Pd-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
Miller Puckette wrote:
Looks like I already took a "DESTDIR" patch sometime in the past, and the present one merely makes it more nearly correct -- so I just hand-adapted it into vanilla. (new test release hopefully to arrive tomorrow once I've tested it on the usual machines)
ok. actually pd-0.41-4 still needs those two patches to install properly:
http://pd-overlay.svn.sourceforge.net/viewvc/pd-overlay/pd-overlay/media-sou... http://pd-overlay.svn.sourceforge.net/viewvc/pd-overlay/pd-overlay/media-sou...
(the patch about CFLAGS basically removes -m32 and adds -fPIC for making it build on x86_64 machines, and also takes external CFLAGS (through the CFLAGS env var) -- also it doesn't strip the executable, but this is more Gentoo QA related)
On Dec 28, 2008, at 5:11 PM, mescalinum@gmail.com wrote:
Miller Puckette wrote:
Looks like I already took a "DESTDIR" patch sometime in the past, and the present one merely makes it more nearly correct -- so I just hand- adapted it into vanilla. (new test release hopefully to arrive tomorrow once I've tested it on the usual machines)
ok. actually pd-0.41-4 still needs those two patches to install properly:
http://pd-overlay.svn.sourceforge.net/viewvc/pd-overlay/pd-overlay/media-sou... http://pd-overlay.svn.sourceforge.net/viewvc/pd-overlay/pd-overlay/media-sou...
(the patch about CFLAGS basically removes -m32 and adds -fPIC for making it build on x86_64 machines, and also takes external CFLAGS (through the CFLAGS env var) -- also it doesn't strip the executable, but this is more Gentoo QA related)
So to follow up on the original discussion, for pd-devel policy, I think it makes sense to allow merges from pd-vanilla for makefile.in and configure.in, if that would help here.
.hc
-- FF
Pd-dev mailing list Pd-dev@iem.at http://lists.puredata.info/listinfo/pd-dev