apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: apr configure.in Makefile.in
Date Fri, 27 Jul 2001 10:22:04 GMT
dreid       01/07/27 03:22:04

  Modified:    .        configure.in Makefile.in
  Log:
  Neither beos or OS/2 has any subdirs that need installing, so the commit
  that added INSTALL_SUBDIRS broke the build.  I couldn't find a way of getting
  it to work with an empty INSTALL_SUBDIRS (others may be able to) so I
  opted for setting it initially to 'none' and then testing for that when
  come to make install.
  
  This gets make install working again but was only tested on beos. Other
  platforms shouldn't be affected, but please test.
  
  Brian, does this work for OS/2?
  
  Revision  Changes    Path
  1.347     +1 -0      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.346
  retrieving revision 1.347
  diff -u -r1.346 -r1.347
  --- configure.in	2001/07/27 01:27:07	1.346
  +++ configure.in	2001/07/27 10:22:04	1.347
  @@ -192,6 +192,7 @@
   	;;
   esac
   LOCAL_MM_LIB="../shmem/unix/mm/libmm.la"
  +config_subdirs="none"
   case $host in
      i386-ibm-aix* | *-ibm-aix[1-2].* | *-ibm-aix3.* | *-ibm-aix4.1 | *-ibm-aix4.1.* | *-ibm-aix4.2
| *-ibm-aix4.2.*)
          OSDIR="aix"
  
  
  
  1.52      +5 -3      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Makefile.in	2001/07/26 00:08:40	1.51
  +++ Makefile.in	2001/07/27 10:22:04	1.52
  @@ -61,9 +61,11 @@
   	fi; \
   	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
   	$(LIBTOOL) --mode=install cp APRVARS $(libdir)
  -	@for i in $(INSTALL_SUBDIRS); do \
  -	    ( cd $$i ; $(MAKE) install ); \
  -	done
  +	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
  +            for i in $(INSTALL_SUBDIRS); do \
  +	        ( cd $$i ; $(MAKE) install ); \
  +	    done \
  +        fi
   
   $(TARGET_LIB):
   	@for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \
  
  
  

Mime
View raw message