jfclere 01/06/21 02:06:50
Modified: . Makefile.in configure.in
Log:
Fix the libdir and ICONV_DEFAULT_PATH. They have to be the same.
Revision Changes Path
1.4 +8 -7 apr-iconv/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-iconv/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 2001/04/10 15:46:34 1.3
+++ Makefile.in 2001/06/21 09:06:49 1.4
@@ -20,7 +20,8 @@
### install location
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/bin
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/lib
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -39,15 +40,15 @@
@APR_SOURCE_DIR@/build/mkdir.sh $(includedir); \
fi; \
cp lib/*.h $(includedir); \
+ if [ ! -d $(lib_prefix) ]; then \
+ @APR_SOURCE_DIR@/build/mkdir.sh $(lib_prefix); \
+ fi; \
+ $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(lib_prefix)
if [ ! -d $(libdir) ]; then \
@APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
- fi; \
- $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
- if [ ! -d $(libdir)/iconv ]; then \
- @APR_SOURCE_DIR@/build/mkdir.sh $(libdir)/iconv; \
fi; \
- (cd ccs; $(LIBTOOL) --mode=install cp *.la $(libdir)/iconv)
- (cd ces; $(LIBTOOL) --mode=install cp *.la $(libdir)/iconv)
+ (cd ccs; $(LIBTOOL) --mode=install cp *.la $(libdir))
+ (cd ces; $(LIBTOOL) --mode=install cp *.la $(libdir))
if [ ! -d $(exec_prefix) ]; then \
@APR_SOURCE_DIR@/build/mkdir.sh $(exec_prefix); \
fi; \
1.4 +3 -1 apr-iconv/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-iconv/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 2001/04/25 17:05:58 1.3
+++ configure.in 2001/06/21 09:06:50 1.4
@@ -8,7 +8,7 @@
AC_CONFIG_AUX_DIR(../apr/build)
AC_CONFIG_HEADER(lib/apr_iconv_private.h)
AC_PREFIX_DEFAULT(/usr/local/apache2)
-test "$prefix" = "NONE" && prefix='/usr/local/apache2'
+#test "$prefix" = "NONE" && prefix='/usr/local/apache2'
AC_PROG_CC
AC_PROG_AWK
@@ -62,6 +62,8 @@
# Adds in config *.h file
AC_DEFINE_UNQUOTED(ICONV_DEFAULT_PATH,"$prefix/lib/iconv",
[ Directory where the *.so tables are stored ] )
+iconv_libdir=$prefix/lib/iconv
+AC_SUBST(iconv_libdir)
dnl
dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
