The attached patch changes the following command in three Makefile.am files:

install-data-hook:
        cp localmk $(datadir)/makefile


to:

install-data-hook:
        cp localmk $(DESTDIR)$(datadir)/makefile


This allows the following command to succeed and operate properly:

make install DESTDIR=/my/install/path


All of the default automake installation rules add DESTDIR to the installation path, but those three hand-written rules do not. Adding DESTDIR allows the entire package to be installed to a specified directory.


Harold


P.S. I am the Cygwin/X project leader (http://xfree86.cygwin.com/) and I am working on packaging OpenDX for Cygwin/X. I will be sending some patches for the dx module shortly that enable an '--enable-shared --disable-static' build on Cygwin.
? dxsamples.diff
Index: callmodule/Makefile.am
===================================================================
RCS file: /src/master/dxsamples/callmodule/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- callmodule/Makefile.am      19 Jun 2003 05:00:39 -0000      1.5
+++ callmodule/Makefile.am      5 Dec 2003 03:33:57 -0000
@@ -7,7 +7,7 @@
 EXTRA_DIST = $(data_DATA)
 
 install-data-hook:
-       cp localmk $(datadir)/makefile
+       cp localmk $(DESTDIR)$(datadir)/makefile
 
 uninstall-local:
        rm $(datadir)/makefile
Index: program_guide/Makefile.am
===================================================================
RCS file: /src/master/dxsamples/program_guide/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- program_guide/Makefile.am   19 Jun 2003 05:07:44 -0000      1.5
+++ program_guide/Makefile.am   5 Dec 2003 03:33:58 -0000
@@ -19,7 +19,7 @@
 EXTRA_DIST = $(data_DATA) 
 
 install-data-hook:
-       cp localmk $(datadir)/makefile
+       cp localmk $(DESTDIR)$(datadir)/makefile
 
 uninstall-local:
        rm $(datadir)/makefile
Index: stereo/src/Makefile.am
===================================================================
RCS file: /src/master/dxsamples/stereo/src/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- stereo/src/Makefile.am      1 Apr 2002 02:36:28 -0000       1.2
+++ stereo/src/Makefile.am      5 Dec 2003 03:34:00 -0000
@@ -7,7 +7,7 @@
 EXTRA_DIST = $(data_DATA) 
 
 install-data-hook:
-       cp localmk $(datadir)/makefile
+       cp localmk $(DESTDIR)$(datadir)/makefile
 
 uninstall-local:
        rm $(datadir)/makefile

Reply via email to