Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv8236 Modified Files: configure Log Message: DESTDIR support , patch taken from the Debian package by Samuel Hocevar < sam == at == zoy == dot == org > Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.211 retrieving revision 1.212 diff -u -d -r1.211 -r1.212 --- configure 12 Oct 2005 22:24:03 -0000 1.211 +++ configure 19 Oct 2005 14:37:15 -0000 1.212 @@ -1276,10 +1276,10 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH -echo "prefix=$prefix" >> config.mak -echo "libdir=$libdir" >> config.mak -echo "bindir=$bindir" >> config.mak -echo "mandir=$mandir" >> config.mak +echo "prefix=\$(DESTDIR)$prefix" >> config.mak +echo "libdir=\$(DESTDIR)$libdir" >> config.mak +echo "bindir=\$(DESTDIR)$bindir" >> config.mak +echo "mandir=\$(DESTDIR)$mandir" >> config.mak echo "MAKE=$make" >> config.mak echo "CC=$cc" >> config.mak echo "AR=$ar" >> config.mak
2005/10/19, Diego Biurrun CVS <diego at mplayerhq.hu>:
Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv8236
Modified Files: configure Log Message: DESTDIR support , patch taken from the Debian package by Samuel Hocevar < sam == at == zoy == dot == org >
Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.211 retrieving revision 1.212 diff -u -d -r1.211 -r1.212 --- configure 12 Oct 2005 22:24:03 -0000 1.211 +++ configure 19 Oct 2005 14:37:15 -0000 1.212 @@ -1276,10 +1276,10 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
-echo "prefix=$prefix" >> config.mak -echo "libdir=$libdir" >> config.mak -echo "bindir=$bindir" >> config.mak -echo "mandir=$mandir" >> config.mak +echo "prefix=\$(DESTDIR)$prefix" >> config.mak +echo "libdir=\$(DESTDIR)$libdir" >> config.mak +echo "bindir=\$(DESTDIR)$bindir" >> config.mak +echo "mandir=\$(DESTDIR)$mandir" >> config.mak echo "MAKE=$make" >> config.mak echo "CC=$cc" >> config.mak echo "AR=$ar" >> config.mak
This is no-sense DESTDIR belongs to Makefile not to configure ! This means that packet builders do something like DESTDIR=/tmp/packets make install In it current form DESTDIR just dublicates prefix! (with very high chanse destdir to be included in the lib data as default location, i just cannot check it at the moment) Please revert.
On Mon, Oct 31, 2005 at 02:33:07PM +0200, Ivan Kalvachev wrote:
2005/10/19, Diego Biurrun CVS <diego at mplayerhq.hu>:
Modified Files: configure Log Message: DESTDIR support , patch taken from the Debian package by Samuel Hocevar < sam == at == zoy == dot == org >
--- configure 12 Oct 2005 22:24:03 -0000 1.211 +++ configure 19 Oct 2005 14:37:15 -0000 1.212 @@ -1276,10 +1276,10 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
-echo "prefix=$prefix" >> config.mak -echo "libdir=$libdir" >> config.mak -echo "bindir=$bindir" >> config.mak -echo "mandir=$mandir" >> config.mak +echo "prefix=\$(DESTDIR)$prefix" >> config.mak +echo "libdir=\$(DESTDIR)$libdir" >> config.mak +echo "bindir=\$(DESTDIR)$bindir" >> config.mak +echo "mandir=\$(DESTDIR)$mandir" >> config.mak
This is no-sense [unverified claims] Please revert.
Nonsense. Read the patch and the discussion about it. You will see that the commit is correct. Diego P.S.: Please cut down the stuff you quote a bit, your messages are unnecessarily long, thanks.
On Mon, Oct 31, 2005 at 02:40:46PM +0100, Diego Biurrun wrote:
On Mon, Oct 31, 2005 at 02:33:07PM +0200, Ivan Kalvachev wrote:
2005/10/19, Diego Biurrun CVS <diego at mplayerhq.hu>:
Modified Files: configure Log Message: DESTDIR support , patch taken from the Debian package by Samuel Hocevar < sam == at == zoy == dot == org >
--- configure 12 Oct 2005 22:24:03 -0000 1.211 +++ configure 19 Oct 2005 14:37:15 -0000 1.212 @@ -1276,10 +1276,10 @@ echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
-echo "prefix=$prefix" >> config.mak -echo "libdir=$libdir" >> config.mak -echo "bindir=$bindir" >> config.mak -echo "mandir=$mandir" >> config.mak +echo "prefix=\$(DESTDIR)$prefix" >> config.mak +echo "libdir=\$(DESTDIR)$libdir" >> config.mak +echo "bindir=\$(DESTDIR)$bindir" >> config.mak +echo "mandir=\$(DESTDIR)$mandir" >> config.mak
This is no-sense [unverified claims] Please revert.
Nonsense. Read the patch and the discussion about it. You will see that the commit is correct.
Diego seems to be correct. $(DESTDIR) is not expanded by the configure script (notice the \$ instead of $) but inserted literally into the makefile. Rich
participants (4)
-
dalias＠aerifal.cx -
diego＠biurrun.de -
diego＠mplayerhq.hu -
ikalvachev＠gmail.com