apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: apr-iconv/lib iconv.h
Date Tue, 10 Apr 2001 15:46:35 GMT
jfclere     01/04/10 08:46:35

  Modified:    .        Makefile.in configure.in
               lib      iconv.h
  Log:
  Make apr-iconv installable. Via configure --prefix
  
  Revision  Changes    Path
  1.3       +25 -3     apr-iconv/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-iconv/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in	2001/03/30 17:20:45	1.2
  +++ Makefile.in	2001/04/10 15:46:34	1.3
  @@ -1,7 +1,6 @@
   #
   # Top-level Makefile for APRICONV
   #
  -
   TARGET_LIB = lib/libapriconv.la
   TARGET_EXPORTS = lib/apriconv.exports
   
  @@ -17,9 +16,13 @@
   DISTCLEAN_TARGETS = config.cache config.log config.status \
   	export_vars.sh
   EXTRACLEAN_TARGETS = configure libtool aclocal.m4
  +
  +### install location
  +prefix=@prefix@
  +exec_prefix=@prefix@/bin
  +libdir=@libdir@
  +includedir=@includedir@
   
  -### fix this up at some point (install location)
  -libdir = /usr/local/lib
   
   delete-lib:
   	@if test -f $(TARGET_LIB); then \
  @@ -30,6 +33,25 @@
   		$(RM) -f $(TARGET_LIB) ; \
   	    fi \
   	fi
  +
  +install: $(TARGET_LIB)
  +	if [ ! -d $(includedir) ]; then \
  +	    @APR_SOURCE_DIR@/build/mkdir.sh $(includedir); \
  +	fi; \
  +	cp lib/*.h $(includedir); \
  +	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)
  +	if [ ! -d $(exec_prefix) ]; then \
  +	    @APR_SOURCE_DIR@/build/mkdir.sh $(exec_prefix); \
  +	fi; \
  +	(cd util/.libs; $(LIBTOOL) --mode=install cp iconv $(exec_prefix))
   
   $(TARGET_LIB):
   	(cd lib; make)
  
  
  
  1.2       +6 -0      apr-iconv/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-iconv/configure.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure.in	2001/03/24 04:15:44	1.1
  +++ configure.in	2001/04/10 15:46:34	1.2
  @@ -6,6 +6,7 @@
   AC_INIT(build/rules.mk.in)
   
   AC_CONFIG_AUX_DIR(../apr/build)
  +AC_CONFIG_HEADER(lib/apr_iconv_private.h)
   
   AC_PROG_CC
   AC_PROG_AWK
  @@ -54,6 +55,11 @@
   LIBS="$LIBS $APR_EXPORT_LIBS"
   
   AC_SUBST(APRUTIL_EXPORT_LIBS)
  +
  +#
  +# Adds in config *.h file
  +AC_DEFINE_UNQUOTED(ICONV_DEFAULT_PATH,"$prefix/lib/iconv",
  +	[ Directory where the *.so tables are stored ] )
   
   dnl
   dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
  
  
  
  1.5       +1 -1      apr-iconv/lib/iconv.h
  
  Index: iconv.h
  ===================================================================
  RCS file: /home/cvs/apr-iconv/lib/iconv.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- iconv.h	2001/04/04 17:28:56	1.4
  +++ iconv.h	2001/04/10 15:46:35	1.5
  @@ -34,9 +34,9 @@
   
   #include "apr.h"
   #include "apr_pools.h"
  +#include "apr_iconv_private.h" /* contains ICONV_DEFAULT_PATH */
   
   /* To be processed by configure */
  -#define ICONV_DEFAULT_PATH "/usr/local/lib/iconv"
   #define EFTYPE -1234
   /* To be processed by configure */
   
  
  
  

Mime
View raw message