[Gsrc-commit] /srv/bzr/gsrc/trunk r1267: fix acm install

[Brandon Invergo]

------------------------------------------------------------
revno: 1267
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-22 00:00:19 +0100
message:
  fix acm install
added:
  gnu/acm/files/
  gnu/acm/files/acm-5.1-fix-install.diff
modified:
  gnu/acm/Makefile
  gnu/acm/sha256sums

=== modified file 'gnu/acm/Makefile'
--- a/gnu/acm/Makefile  2012-10-27 23:43:13 +0000
+++ b/gnu/acm/Makefile  2012-11-21 23:00:19 +0000
@@ -9,6 +9,7 @@
 MASTER_SUBDIR = acm/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+PATCHFILES = $(DISTNAME)-fix-install.diff
 
 BUILDDEPS = 
 LIBDEPS = 

=== added directory 'gnu/acm/files'
=== added file 'gnu/acm/files/acm-5.1-fix-install.diff'
--- a/gnu/acm/files/acm-5.1-fix-install.diff    1970-01-01 00:00:00 +0000
+++ b/gnu/acm/files/acm-5.1-fix-install.diff    2012-11-21 23:00:19 +0000
@@ -0,0 +1,65 @@
+diff -x config.log -x config.status -ru tmp/acm-5.1/doc/Makefile.in 
work/acm-5.1/doc/Makefile.in
+--- tmp/acm-5.1/doc/Makefile.in        2010-12-08 19:43:11.000000000 +0100
++++ work/acm-5.1/doc/Makefile.in       2012-11-21 23:55:20.217488225 +0100
+@@ -17,7 +17,7 @@
+ #
+ # Version: @VERSION@
+ #
+-
++DESTDIR =
+ # Program to convert DVI files to PostScript
+ DVIPS = dvips -D 300
+ # Program to convert texinfo files to html
+@@ -44,8 +44,8 @@
+ #
+ 
+ install: acm.info
+-      -mkdir -p $(infodir)
+-      $(INSTALL_DATA) $(srcdir)/acm.info $(infodir)
++      -mkdir -p $(DESTDIR)$(infodir)
++      $(INSTALL_DATA) $(srcdir)/acm.info $(DESTDIR)$(infodir)
+ 
+ #
+ # Dependencies for cleanup
+diff -x config.log -x config.status -ru tmp/acm-5.1/objects/Makefile.in 
work/acm-5.1/objects/Makefile.in
+--- tmp/acm-5.1/objects/Makefile.in    2010-12-08 19:43:11.000000000 +0100
++++ work/acm-5.1/objects/Makefile.in   2012-11-21 23:54:40.204149587 +0100
+@@ -1,3 +1,4 @@
++     DESTDIR =
+       srcdir = @srcdir@
+       prefix = @prefix@
+       bindir = $(prefix)/bin
+@@ -26,11 +27,11 @@
+ all clean mostlyclean realclean info dvi dist depend:
+ 
+ install:
+-      -mkdir -p $(ACM_OBJECT_LIBRARY)
++      -mkdir -p $(DESTDIR)$(ACM_OBJECT_LIBRARY)
+       @for i in $(SCENES) $(OBJECTS) $(SOUNDS) ; do \
+               echo Installing $$i ... ; \
+-          rm -rf $(ACM_OBJECT_LIBRARY)$$i ; \
+-              $(INSTALL_DATA) $(srcdir)/$$i $(ACM_OBJECT_LIBRARY)/$$i ; \
++          rm -rf $(DESTDIR)$(ACM_OBJECT_LIBRARY)$$i ; \
++              $(INSTALL_DATA) $(srcdir)/$$i 
$(DESTDIR)$(ACM_OBJECT_LIBRARY)/$$i ; \
+       done
+ 
+ uninstall:
+diff -x config.log -x config.status -ru tmp/acm-5.1/src/Makefile.in 
work/acm-5.1/src/Makefile.in
+--- tmp/acm-5.1/src/Makefile.in        2010-12-08 19:43:11.000000000 +0100
++++ work/acm-5.1/src/Makefile.in       2012-11-21 23:53:48.900809274 +0100
+@@ -1,5 +1,5 @@
+ # @configure_input@
+-
++     DESTDIR =
+       srcdir = @srcdir@
+       prefix = @prefix@
+       bindir = $(prefix)/bin
+@@ -77,7 +77,7 @@
+       rm -f TAGS tags
+ 
+ install: $(PROGRAMS)
+-      $(INSTALL_PROGRAM) acm $(bindir)/acm
++      $(INSTALL_PROGRAM) acm $(DESTDIR)$(bindir)/acm
+ 
+ uninstall:
+       rm -f $(bindir)/acm

=== modified file 'gnu/acm/sha256sums'
--- a/gnu/acm/sha256sums        2012-08-31 10:53:14 +0000
+++ b/gnu/acm/sha256sums        2012-11-21 23:00:19 +0000
@@ -1,2 +1,3 @@
 01efbf11a1c23f0b896532f8f8c5cbcb9ca1a655fa6b06919f9664b8c32ea687  
download/acm-5.1.tar.gz
+bee994ec58bb850835ba2d672e5e12c409302d014de5b0ee3f4e21ddf9991b27  
download/acm-5.1-fix-install.diff
 01139868dfc56bf9b9e1efe88b75a074ba08cbae498261e007ad4fdbab777e49  
download/acm-5.1.tar.gz.sig