[Swftools-common] patch: Add ${DESTDIR} to 'make install' for RPM packaging

[John Morris]

I've modified Dag Wieers' swftools RPM for 0.9.0.  In order for it to be 
packaged correctly, it needs to be installed into a buildroot rather 
than its final destination in the root fs.  This patch adds a ${DESTDIR} 
variable to the Makefiles so that the RPM %install section can run make 
install as such:

        %{__make} install DESTDIR="%{buildroot}"

Thanks-

        John

diff -ruN ../work/swftools-0.9.0/Makefile.common.in 
swftools-0.9.0/Makefile.common.in
--- ../work/swftools-0.9.0/Makefile.common.in   2009-04-13 07:27:16.000000000 
+0800
+++ swftools-0.9.0/Makefile.common.in   2009-06-22 18:32:47.000000000 +0800
@@ -61,9 +61,9 @@
 
 # ------------------- defines -------------------------
 
-INSTALL_BIN = echo installing $$file to $(bindir);$(INSTALL_PROGRAM) $$file 
$(bindir)/`echo $$file|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 
's/$$/$(EXEEXT)/'`
+INSTALL_BIN = echo installing $$file to ${DESTDIR}$(bindir);$(INSTALL_PROGRAM) 
$$file ${DESTDIR}$(bindir)/`echo $$file|sed 's/$(EXEEXT)$$//'|sed 
'$(transform)'|sed 's/$$/$(EXEEXT)/'`
 UNINSTALL_BIN = ff=`echo $$file|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 
's/$$/$(EXEEXT)/'`;echo rm -f $(bindir)/$$ff;rm -f $(bindir)/$$ff
-INSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed 
'$(transform)'`.1; echo "$(INSTALL_DATA) $$ff $(man1dir)/$$inst"; 
$(INSTALL_DATA) $$ff $(man1dir)/$$inst
+INSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed 
'$(transform)'`.1; echo "$(INSTALL_DATA) $$ff $(man1dir)/$$inst"; 
$(INSTALL_DATA) $$ff ${DESTDIR}$(man1dir)/$$inst
 UNINSTALL_MAN1 = ff=$(srcdir)/$$file.1; inst=`echo $$file | sed 
'$(transform)'`.1; echo "rm -f $(man1dir)/$$inst"; rm -f $(man1dir)/$$inst
 
 #%.o: %.c
diff -ruN ../work/swftools-0.9.0/avi2swf/Makefile.in 
swftools-0.9.0/avi2swf/Makefile.in
--- ../work/swftools-0.9.0/avi2swf/Makefile.in  2009-01-28 01:18:36.000000000 
+0800
+++ swftools-0.9.0/avi2swf/Makefile.in  2009-06-22 18:17:20.000000000 +0800
@@ -25,8 +25,8 @@
        $(STRIP) avi2swf$(E)
 
 install:
-       $(mkinstalldirs) $(bindir)
-       $(mkinstalldirs) $(man1dir)
+       $(mkinstalldirs) ${DESTDIR}$(bindir)
+       $(mkinstalldirs) ${DESTDIR}$(man1dir)
        @file=avi2swf;$(INSTALL_BIN);$(INSTALL_MAN1)
        
 uninstall:
diff -ruN ../work/swftools-0.9.0/src/Makefile.in swftools-0.9.0/src/Makefile.in
--- ../work/swftools-0.9.0/src/Makefile.in      2009-01-28 01:18:37.000000000 
+0800
+++ swftools-0.9.0/src/Makefile.in      2009-06-22 18:18:04.000000000 +0800
@@ -108,8 +108,8 @@
        $(STRIP) $@
 
 install:
-       $(mkinstalldirs) $(bindir)
-       $(mkinstalldirs) $(man1dir)
+       $(mkinstalldirs) ${DESTDIR}$(bindir)
+       $(mkinstalldirs) ${DESTDIR}$(man1dir)
        @for file in $(programs) $(opt_programs); do if test -f $$file;then 
$(INSTALL_BIN);$(INSTALL_MAN1);fi;done
        
 uninstall:
diff -ruN ../work/swftools-0.9.0/swfs/Makefile.in 
swftools-0.9.0/swfs/Makefile.in
--- ../work/swftools-0.9.0/swfs/Makefile.in     2009-01-28 01:18:37.000000000 
+0800
+++ swftools-0.9.0/swfs/Makefile.in     2009-06-22 18:18:29.000000000 +0800
@@ -34,17 +34,17 @@
        ./PreLoaderTemplate$(E) || true
 
 install:
-       $(mkinstalldirs) $(pkgdatadir)
-       $(mkinstalldirs) $(pkgdatadir)/swfs
-       $(INSTALL_DATA) ./simple_viewer.swf $(pkgdatadir)/swfs/simple_viewer.swf
-       $(INSTALL_DATA) ./keyboard_viewer.swf 
$(pkgdatadir)/swfs/keyboard_viewer.swf
-       $(INSTALL_DATA) ./PreLoaderTemplate.swf 
$(pkgdatadir)/swfs/PreLoaderTemplate.swf
-       $(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf
-       $(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf
+       $(mkinstalldirs) ${DESTDIR}$(pkgdatadir)
+       $(mkinstalldirs) ${DESTDIR}$(pkgdatadir)/swfs
+       $(INSTALL_DATA) ./simple_viewer.swf 
${DESTDIR}$(pkgdatadir)/swfs/simple_viewer.swf
+       $(INSTALL_DATA) ./keyboard_viewer.swf 
${DESTDIR}$(pkgdatadir)/swfs/keyboard_viewer.swf
+       $(INSTALL_DATA) ./PreLoaderTemplate.swf 
${DESTDIR}$(pkgdatadir)/swfs/PreLoaderTemplate.swf
+       $(INSTALL_DATA) ./tessel_loader.swf 
${DESTDIR}$(pkgdatadir)/swfs/tessel_loader.swf
+       $(INSTALL_DATA) ./swft_loader.swf 
${DESTDIR}$(pkgdatadir)/swfs/swft_loader.swf
        test -f $(pkgdatadir)/swfs/default_viewer.swf || \
-           $(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf 
$(pkgdatadir)/swfs/default_viewer.swf;
+           $(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf 
${DESTDIR}$(pkgdatadir)/swfs/default_viewer.swf;
        test -f $(pkgdatadir)/swfs/default_loader.swf || \
-           $(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf 
$(pkgdatadir)/swfs/default_loader.swf;
+           $(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf 
${DESTDIR}$(pkgdatadir)/swfs/default_loader.swf;
                
 uninstall:
        $(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf