Fixed destdir patch... for REAL this time...

diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index 41d2993f376ee39679d61a20649cc92737f22891..11b950ba28569bc2d89f55a17574e73209efc2ef 100644 (file)
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -8,12 +8,12 @@ MD5 eec73fbea3403356a034bd509fe1a022 metadata.xml 436
 MD5 99136b248ff383abec90471de2c701ac files/compface-1.4-errno.diff 908
 MD5 9b8d9c4812b5caa0557fe8bc88a688d8 files/digest-compface-1.4 63
 MD5 92cd926808b9b818d1a0228938edd8e4 files/compface-1.4-destdir.diff 1759
-MD5 720fad6c1223bca1d00e936c92e470b4 files/compface-1.5-destdir.diff 1598
+MD5 bc74c4ff7219b259c15153a1ce23ef76 files/compface-1.5-destdir.diff 1680
 MD5 278f048a005cd301b3ce122438229c6c files/digest-compface-1.5 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB3w65ArHZZzCEUG0RAn/MAJ9NWAmMsqLHsGoGHrwwnhO8k/9CbwCffRjk
-TDZSKY1JJIijPd1JMGbL41E=
-=na/W
+iD8DBQFB3w+mArHZZzCEUG0RAtRzAJ4po5yzn0Ucf/cCVrb+Qi5xeXtrrgCfSASI
+BjhlyrUGPOoC1HJxDaFb5kw=
+=IjCS
 -----END PGP SIGNATURE-----

diff --git a/media-libs/compface/files/compface-1.5-destdir.diff b/media-libs/compface/files/compface-1.5-destdir.diff
index fb7642bbfaca376037d31c3ae3a10e743186b550..1971608c28819479fe4c94d4237ebee23510f5e3 100644 (file)
--- a/media-libs/compface/files/compface-1.5-destdir.diff
+++ b/media-libs/compface/files/compface-1.5-destdir.diff
@@ -1,17 +1,15 @@
 diff -Naurp compface-1.5.orig/Makefile.in compface-1.5/Makefile.in
 --- compface-1.5.orig/Makefile.in      2004-12-23 22:23:08.000000000 -0800
-+++ compface-1.5/Makefile.in   2005-01-07 14:35:05.055230327 -0800
++++ compface-1.5/Makefile.in   2005-01-07 14:38:51.051710220 -0800
 @@ -71,18 +71,16 @@ dist: $(DISTFILES)\r
                $(RM) -rf `cat .fname` .fname\r
  \r
  install:      $(NAME) $(UNNAME) $(LIBNAME)\r
 -              $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(EXECUTABLE) \r
-+              $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(DESTDIR)$(EXECUTABLE) \r
-               -chmod 0755 $(EXECUTABLE)\r
+-              -chmod 0755 $(EXECUTABLE)\r
 -              -strip $(EXECUTABLE)\r
 -              $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(UNEXECUTABLE)\r
-+              $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(DESTDIR)$(UNEXECUTABLE)\r
-               -chmod 0755 $(UNEXECUTABLE)\r
+-              -chmod 0755 $(UNEXECUTABLE)\r
 -              -strip $(UNEXECUTABLE)\r
 -              $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1\r
 -              cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1\r
@@ -19,6 +17,10 @@ diff -Naurp compface-1.5.orig/Makefile.in compface-1.5/Makefile.in
 -              cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3\r
 -              for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done\r
 -              $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)\r
++              $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(DESTDIR)$(EXECUTABLE) \r
++              -chmod 0755 $(DESTDIR)$(EXECUTABLE)\r
++              $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(DESTDIR)$(UNEXECUTABLE)\r
++              -chmod 0755 $(DESTDIR)$(UNEXECUTABLE)\r
 +              $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1\r
 +              $(LN_S) $(NAME).1 $(DESTDIR)$(MAN1DIR)/$(UNNAME).1\r
 +              $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3\r