minfrin 2004/07/02 06:11:48
Modified: . CHANGES Makefile.in
Log:
Add the possiblity of a DESTDIR prefix to Makefile.in to make it
consistent with the behaviour of apr and apr-util.
Revision Changes Path
1.10 +3 -0 apr-iconv/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-iconv/CHANGES,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CHANGES 26 Sep 2003 07:47:13 -0000 1.9
+++ CHANGES 2 Jul 2004 13:11:47 -0000 1.10
@@ -1,5 +1,8 @@
Changes with APR-ICONV 1.0
+ *) Add the possiblity of a DESTDIR prefix to Makefile.in to make it
+ consistent with the behaviour of apr and apr-util. [Graham Leggett]
+
Changes with APR-ICONV 0.9.5
Changes with APR-ICONV 0.9.4
1.7 +14 -14 apr-iconv/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-iconv/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 26 Sep 2003 07:47:13 -0000 1.6
+++ Makefile.in 2 Jul 2004 13:11:47 -0000 1.7
@@ -26,25 +26,25 @@
MKINSTALLDIRS=$(abs_srcdir)/build/mkdir.sh
install:
- if [ ! -d $(includedir) ]; then \
- $(MKINSTALLDIRS) $(includedir); \
+ if [ ! -d $(DESTDIR)$(includedir) ]; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir); \
fi; \
- cp -p $(abs_srcdir)/include/*.h $(includedir); \
- cp -p $(abs_srcdir)/lib/*.h $(includedir); \
- cp -p $(abs_builddir)/lib/*.h $(includedir); \
+ cp -p $(abs_srcdir)/include/*.h $(DESTDIR)$(includedir); \
+ cp -p $(abs_srcdir)/lib/*.h $(DESTDIR)$(includedir); \
+ cp -p $(abs_builddir)/lib/*.h $(DESTDIR)$(includedir); \
if [ ! -d $(lib_prefix) ]; then \
- $(MKINSTALLDIRS) $(lib_prefix); \
+ $(MKINSTALLDIRS) $(DESTDIR)$(lib_prefix); \
fi;
- (cd lib; $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(lib_prefix))
- if [ ! -d $(libdir) ]; then \
- $(MKINSTALLDIRS) $(libdir); \
+ (cd lib; $(LIBTOOL) --mode=install cp $(TARGET_LIB)
$(DESTDIR)$(lib_prefix))
+ if [ ! -d $(DESTDIR)$(libdir) ]; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
fi; \
- (cd ccs; for i in *.la; do $(LIBTOOL) --mode=install cp $$i $(libdir);
done)
- (cd ces; for i in *.la; do $(LIBTOOL) --mode=install cp $$i $(libdir);
done)
- if [ ! -d $(exec_prefix) ]; then \
- $(MKINSTALLDIRS) $(exec_prefix); \
+ (cd ccs; for i in *.la; do $(LIBTOOL) --mode=install cp $$i
$(DESTDIR)$(libdir); done)
+ (cd ces; for i in *.la; do $(LIBTOOL) --mode=install cp $$i
$(DESTDIR)$(libdir); done)
+ if [ ! -d $(DESTDIR)$(exec_prefix) ]; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(exec_prefix); \
fi; \
- (cd util; $(LIBTOOL) --mode=install cp iconv $(exec_prefix))
+ (cd util; $(LIBTOOL) --mode=install cp iconv $(DESTDIR)$(exec_prefix))
docs:
mkdir ./docs
