httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: httpd-apreq-2 Makefile.am acinclude.m4 configure.ac
Date Fri, 16 Apr 2004 13:20:52 GMT
joes        2004/04/16 06:20:52

  Modified:    .        Makefile.am acinclude.m4 configure.ac
  Log:
  Use MAKE variable in Makefile.am, not "make".  Also correct debian workaround for missing
PACKAGE/VERSION
  
  Revision  Changes    Path
  1.21      +6 -6      httpd-apreq-2/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/Makefile.am,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Makefile.am	7 Nov 2003 20:05:19 -0000	1.20
  +++ Makefile.am	16 Apr 2004 13:20:51 -0000	1.21
  @@ -32,7 +32,7 @@
   	-rm -rf $(distdir)
   	tar xzvf $(distdir).tar.gz
   	@cd $(distdir); @PERL@ -M$(EUM) -e "die 'Bogus MANIFEST' if $(EUM)::manicheck"
  -	@cd $(distdir); @PERL@ Makefile.PL -apxs @APACHE2_APXS@ && make test
  +	@cd $(distdir); @PERL@ Makefile.PL -apxs @APACHE2_APXS@ && $(MAKE) test
   	rm -rf $(distdir)
   	@echo "$(distdir).tar.gz is kosher."
   
  @@ -73,27 +73,27 @@
   test: lib_test env_test $(PERL_TEST)
   
   env_test:
  -	cd env; make test
  +	cd env; $(MAKE) test
   
   lib_test: check
   	t/testall -v
   
   perl_install:
  -	cd glue/perl; make install
  +	cd glue/perl; $(MAKE) install
   
   perl_test:
  -	cd glue/perl; make test
  +	cd glue/perl; $(MAKE) test
   
   perl_glue:
   	cd glue/perl; @PERL@ ../../build/xsbuilder.pl run
   	cd glue/perl; @PERL@ Makefile.PL -apxs @APACHE2_APXS@
  -	cd glue/perl; make
  +	cd glue/perl; $(MAKE)
   
   if BUILD_HTTPD
   
   install-exec-local: httpd_install
   
   httpd_install:
  -	cd @APACHE2_SRC@; make install
  +	cd @APACHE2_SRC@; $(MAKE) install
   
   endif
  
  
  
  1.17      +2 -2      httpd-apreq-2/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- acinclude.m4	28 Feb 2004 05:19:38 -0000	1.16
  +++ acinclude.m4	16 Apr 2004 13:20:51 -0000	1.17
  @@ -114,12 +114,12 @@
           APREQ_MAJOR_VERSION=`$get_version major $version_hdr APREQ`
           APREQ_DOTTED_VERSION=`$get_version all $version_hdr APREQ`
   
  -        echo "libapreq Version: $APREQ_DOTTED_VERSION"
  -
           APREQ_LIBNAME="apreq$APREQ_MAJOR_VERSION"
           APREQ_INCLUDES=""
           APREQ_LDFLAGS=""
           APREQ_EXPORT_LIBS=""
  +
  +        echo "lib$APREQ_LIBNAME Version: $APREQ_DOTTED_VERSION"
   
           AC_SUBST(APREQ_LIBNAME)
           AC_SUBST(APREQ_LDFLAGS)
  
  
  
  1.15      +3 -6      httpd-apreq-2/configure.ac
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/configure.ac,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- configure.ac	16 Apr 2004 03:30:03 -0000	1.14
  +++ configure.ac	16 Apr 2004 13:20:51 -0000	1.15
  @@ -3,17 +3,14 @@
   AC_PREREQ(2.53)
   AC_INIT(libapreq - Apache Request Library, 2.03-dev, apreq-dev@httpd.apache.org, libapreq2)
   
  -# debian woody's archaic auto* tools don't set PACKAGE/VERSION correctly via 
  -# AC_INIT above, so we do it manually here.
  -AC_SUBST(PACKAGE,libapreq2)
  -AC_SUBST(VERSION,2.03-dev)
  -
   dnl this:
   dnl AC_CONFIG_AUX_DIR(build)
   dnl causes problems on certain platforms
   dnl aclocal.m4:817: required file `build/ltmain.sh' not found
   
  -AM_INIT_AUTOMAKE
  +dnl debian woody's archaic auto* tools don't set PACKAGE/VERSION correctly via 
  +dnl AC_INIT above, so we do it again here.
  +AM_INIT_AUTOMAKE(libapreq2, 2.03-dev)
   
   AC_PROG_MAKE_SET
   
  
  
  

Mime
View raw message