Comparing my sources to those in CVS, I came across this patch I submitted some
time ago, but which was rejected because I set DESTDIR explicitly. (the
remainder of the patch should still be applied because the makefile does not
use libinstalldirs or install-data-local).
I submitted this patch because LyX wasn't installing reLyX correctly. Its
rejection is fair enough. My question, however concerns the ChangeLog entries
below. What is going on, Jean-Marc, and what do I need to do to fix things.
Angus
2000-04-03 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* lib/reLyX/Makefile.am (DESTDIR): add an empty value (since
automake does not provide one).
2000-03-27 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* lib/Makefile.am: use $(DESTDIR) make variable (from Arkadiusz
Miskiewicz <[EMAIL PROTECTED]>)
* lib/reLyX/Makefile.am: ditto.
Index: lib/reLyX/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- lib/reLyX/Makefile.am 2000/04/03 11:36:32 1.5
+++ lib/reLyX/Makefile.am 2000/05/03 15:17:08
@@ -1,3 +1,4 @@
+DESTDIR = /usr/local/share/lyx/
AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES= *.orig *.rej *~ *.bak reLyX reLyX.1
MAINTAINERCLEANFILES = Makefile.in
@@ -16,14 +17,3 @@ LIBINSTFILES = *.pm *.pl README BUGS CHA
reLyX.1:
cp -p $(srcdir)/reLyX.man reLyX.1
-
-libinstalldirs:
- for dir in $(LYXDATADIRS) ; do \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ; \
- done
-
-install-data-local: libinstalldirs
- files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
- for i in $${files} ; do \
- $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/reLyX/$$i ; \
- done
