httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/support Makefile.in
Date Sat, 15 Jun 2002 04:41:52 GMT
rbb         2002/06/14 21:41:52

  Modified:    .        CHANGES Makefile.in
               build    rules.mk.in special.mk
               .        Makefile.in
               .        Makefile.in
               support  Makefile.in
  Log:
  Allow 'make install DESTDIR=/path'.  This allows packagers to install
  into a directory different from the one that was configured.  This
  also mirrors the root= feature from 1.3.  We cannot use prefix=,
  because both APR and APR-util resolve their installation paths at
  configuration time.  This means that there is no variable prefix
  to replace.
  
  PR:	7803
  Submitted by:	Andreas Hasenack <andreas@netbank.com.br>
  
  Revision  Changes    Path
  1.830     +7 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.829
  retrieving revision 1.830
  diff -u -r1.829 -r1.830
  --- CHANGES	14 Jun 2002 17:49:28 -0000	1.829
  +++ CHANGES	15 Jun 2002 04:41:51 -0000	1.830
  @@ -1,5 +1,12 @@
   Changes with Apache 2.0.38
   
  +  *) Allow 'make install DESTDIR=/path'.  This allows packagers to install
  +     into a directory different from the one that was configured.  This 
  +     also mirrors the root= feature from 1.3.  We cannot use prefix=,
  +     because both APR and APR-util resolve their installation paths at 
  +     configuration time.  This means that there is no variable prefix 
  +     to replace.  [Andreas Hasenack <andreas@netbank.com.br>]
  +
     *) AIX 4.3.2 and above: Define SINGLE_LISTEN_UNSERIALIZED_ACCEPT.
        These levels of AIX don't have a thundering herd problem with
        accept().  [Jeff Trawick]
  
  
  
  1.116     +54 -54    httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- Makefile.in	3 Jun 2002 15:25:11 -0000	1.115
  +++ Makefile.in	15 Jun 2002 04:41:51 -0000	1.116
  @@ -28,10 +28,10 @@
   
   install-conf:
   	@echo Installing configuration files
  -	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
  +	@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
   	@cd $(top_srcdir)/docs/conf; \
   	for i in mime.types magic; do \
  -		$(INSTALL_DATA) $$i $(sysconfdir); \
  +		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
   	done; \
   	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
   		cd $$j ; \
  @@ -67,31 +67,31 @@
   					-e 's#@@Port@@#$(PORT)#g' \
   					< $$i; \
   			fi \
  -		) > $(sysconfdir)/$$i; \
  -		chmod 0644 $(sysconfdir)/$$i; \
  +		) > $(DESTDIR)$(sysconfdir)/$$i; \
  +		chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
   		file=`echo $$i|sed s/-std//`; \
   		if [ "$$file" = "httpd.conf" ]; then \
   			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
   		fi; \
  -		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
  -			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
  +		if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
  +			$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
   		fi; \
   	done ; \
   	done
   	@if test -f "$(builddir)/envvars-std"; then \
  -	    cp -p envvars-std $(sbindir); \
  -	    if test ! -f $(sbindir)/envvars; then \
  -	        cp -p envvars-std $(sbindir)/envvars ; \
  +	    cp -p envvars-std $(DESTDIR)$(sbindir); \
  +	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
  +	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
   	    fi ; \
   	fi
   
   install-build:
   	@echo Installing build system files 
  -	@test -d $(installbuilddir) || $(MKINSTALLDIRS) $(installbuilddir) 
  -	@cp build/*.mk $(installbuilddir); \
  +	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)

  +	@cp build/*.mk $(DESTDIR)$(installbuilddir); \
   	sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
  -	    build/config_vars.mk > $(installbuilddir)/config_vars.mk; \
  -	cp $(top_srcdir)/build/instdso.sh $(installbuilddir);
  +	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
  +	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir);
   
   htdocs-srcdir = $(top_srcdir)/docs/docroot
   
  @@ -104,77 +104,77 @@
   
   install-htdocs:
   	@echo Installing HTML documents
  -	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
  -	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
  -	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
  -	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual &&
cp -rp * $(manualdir))
  -	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS"
-print | xargs rm -rf
  +	@test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
  +	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
  +	@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  +	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual &&
cp -rp * $(DESTDIR)$(manualdir))
  +	@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name
"CVS" -print | xargs rm -rf
   
   install-error:
   	@echo Installing error documents
  -	@test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
  -	@cd $(top_srcdir)/docs/error && cp -rp * $(errordir)
  -	@test "x$(errordir)" != "x" && cd $(errordir) && find . -name "CVS" -print
| xargs rm -rf
  +	@test -d $(DESTDIR)$(errordir) || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)
  +	@cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)
  +	@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name
"CVS" -print | xargs rm -rf
   
   install-icons:
   	@echo Installing icons
  -	@test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
  -	@cd $(top_srcdir)/docs/icons && cp -rp * $(iconsdir)
  -	@test "x$(iconsdir)" != "x" && cd $(iconsdir) && find . -name "CVS" -print
| xargs rm -rf
  +	@test -d $(DESTDIR)$(iconsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)
  +	@cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)
  +	@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name
"CVS" -print | xargs rm -rf
   
   install-cgi:
   	@echo Installing CGIs
  -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
  -	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
  -	@test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print
| xargs rm -rf
  +	@test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
  +	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
  +	@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS"
-print | xargs rm -rf
   
   install-other:
  -	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
  -	@test -d $(runtimedir) || $(MKINSTALLDIRS) $(runtimedir)
  +	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
  +	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
   	@for ext in dll x; do \
   		file=apachecore.$$ext; \
   		if test -f $$file; then \
  -			cp -p $$file $(libdir); \
  +			cp -p $$file $(DESTDIR)$(libdir); \
   		fi; \
   	done; \
   	file=httpd.dll; \
   	if test -f $$file; then \
  -		cp -p $$file $(bindir); \
  +		cp -p $$file $(DESTDIR)$(bindir); \
   	fi;
   
   install-include:
   	@echo Installing header files
  -	@test -d $(includedir)     || $(MKINSTALLDIRS) $(includedir)
  -	@cp -p include/*.h $(srcdir)/include/*.h $(includedir)
  -	@cp -p $(srcdir)/os/$(OS_DIR)/os.h $(includedir)
  +	@test -d $(DESTDIR)$(includedir)     || $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
  +	@cp -p include/*.h $(srcdir)/include/*.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/os/$(OS_DIR)/os.h $(DESTDIR)$(includedir)
   	@if test -f $(srcdir)/os/$(OS_DIR)/os-inline.c; then \
  -            cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir); \
  +            cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(DESTDIR)$(includedir); \
           fi;
  -	@cp -p $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h $(includedir)
  -	@cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
  -	@cp -p $(srcdir)/modules/filters/mod_include.h $(includedir)
  -	@cp -p $(srcdir)/modules/generators/mod_cgi.h $(includedir)
  -	@cp -p $(srcdir)/modules/loggers/mod_log_config.h $(includedir)
  -	@cp -p $(srcdir)/modules/http/mod_core.h $(includedir)
  -	@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(includedir)
  -	@cp -p $(srcdir)/modules/ssl/*.h $(includedir)
  -	@cp -p $(srcdir)/srclib/pcre/pcre*.h $(includedir)
  -	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
  -	@chmod 644 $(includedir)/*.h
  +	@cp -p $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/modules/dav/main/mod_dav.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/modules/filters/mod_include.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/modules/generators/mod_cgi.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/modules/loggers/mod_log_config.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
  +	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
  +	@chmod 644 $(DESTDIR)$(includedir)/*.h
   
   install-man:
   	@echo Installing man pages
  -	@test -d $(mandir)      || $(MKINSTALLDIRS) $(mandir)
  -	@test -d $(mandir)/man1 || $(MKINSTALLDIRS) $(mandir)/man1
  -	@test -d $(mandir)/man8 || $(MKINSTALLDIRS) $(mandir)/man8
  -	@cp -p $(top_srcdir)/docs/man/*.1 $(mandir)/man1
  -	@cp -p $(top_srcdir)/docs/man/*.8 $(mandir)/man8
  +	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
  +	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  +	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
  +	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  +	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
   
   install-suexec:
   	@if test -f $(builddir)/support/suexec; then \
  -            test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
  -            $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(sbindir); \
  -            chmod 4755 $(sbindir)/suexec; \
  +            test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
  +            $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
  +            chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
   	fi
   
   suexec:
  
  
  
  1.9       +2 -2      httpd-2.0/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/rules.mk.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- rules.mk.in	18 Apr 2002 17:51:54 -0000	1.8
  +++ rules.mk.in	15 Jun 2002 04:41:52 -0000	1.9
  @@ -197,9 +197,9 @@
   
   local-install: $(TARGETS) $(SHARED_TARGETS) $(INSTALL_TARGETS)
   	@if test -n '$(PROGRAMS)'; then \
  -	    test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
  +	    test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
   	    list='$(PROGRAMS)'; for i in $$list; do \
  -	        $(INSTALL_PROGRAM) $$i $(sbindir); \
  +	        $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir); \
   	    done; \
   	fi
   
  
  
  
  1.20      +2 -2      httpd-2.0/build/special.mk
  
  Index: special.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/special.mk,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- special.mk	13 Mar 2002 20:47:40 -0000	1.19
  +++ special.mk	15 Jun 2002 04:41:52 -0000	1.20
  @@ -62,13 +62,13 @@
   INSTALL_TARGETS = install-modules
   
   install-modules:
  -	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir);
  +	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir);
   	@builtin='$(BUILTIN_LIBS)'; \
   	has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \
   	if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \
   		list='$(shared)'; \
   		for i in $$list; do \
  -			$(top_srcdir)/build/instdso.sh SH_LIBTOOL='$(SH_LIBTOOL)' $$i $(libexecdir); \
  +			$(top_srcdir)/build/instdso.sh SH_LIBTOOL='$(SH_LIBTOOL)' $$i $(DESTDIR)$(libexecdir);
\
   		done; \
   	fi	
   
  
  
  
  1.76      +18 -18    apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- Makefile.in	13 May 2002 05:33:39 -0000	1.75
  +++ Makefile.in	15 Jun 2002 04:41:52 -0000	1.76
  @@ -59,37 +59,37 @@
   	fi
   
   install: $(TARGET_LIB)
  -	if [ ! -d $(includedir) ]; then \
  -	    $(top_srcdir)/build/mkdir.sh $(includedir); \
  +	if [ ! -d $(DESTDIR)$(includedir) ]; then \
  +	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \
   	fi;
  -	cp -p $(top_srcdir)/include/*.h $(includedir);
  +	cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir);
   
   	if test -n "$(top_blddir)"; then \
  -	    cp -p $(top_blddir)/include/*.h $(includedir); \
  +	    cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
   	fi;
  -	if [ ! -d $(libdir) ]; then \
  -	    $(top_srcdir)/build/mkdir.sh $(libdir); \
  +	if [ ! -d $(DESTDIR)$(libdir) ]; then \
  +	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir); \
   	fi;
  -	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
  -	$(LIBTOOL) --mode=install cp APRVARS $(libdir)
  -	$(LIBTOOL) --mode=install cp apr.exp $(libdir)
  -	if [ ! -d $(installbuilddir) ]; then \
  -	   	$(top_srcdir)/build/mkdir.sh $(installbuilddir); \
  +	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
  +	$(LIBTOOL) --mode=install cp APRVARS $(DESTDIR)$(libdir)
  +	$(LIBTOOL) --mode=install cp apr.exp $(DESTDIR)$(libdir)
  +	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
  +	   	$(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
   	fi; 
   	if [ -f libtool ]; then \
  -		$(LIBTOOL) --mode=install cp libtool $(installbuilddir); \
  +		$(LIBTOOL) --mode=install cp libtool $(DESTDIR)$(installbuilddir); \
   	fi;
   	if [ -f shlibtool ]; then \
  -		$(LIBTOOL) --mode=install cp shlibtool $(installbuilddir); \
  +		$(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \
   	fi;
  -	if [ ! -d $(bindir) ]; then \
  -	    $(top_srcdir)/build/mkdir.sh $(bindir); \
  +	if [ ! -d $(DESTDIR)$(bindir) ]; then \
  +	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \
   	fi;
  -	$(LIBTOOL) --mode=install cp apr-config $(bindir)
  -	chmod 755 $(bindir)/apr-config
  +	$(LIBTOOL) --mode=install cp apr-config $(DESTDIR)$(bindir)
  +	chmod 755 $(DESTDIR)$(bindir)/apr-config
   	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
               for i in $(INSTALL_SUBDIRS); do \
  -	        ( cd $$i ; $(MAKE) install ); \
  +	        ( cd $$i ; $(MAKE) root=$(DESTDIR) install ); \
   	    done \
   	fi
   
  
  
  
  1.67      +13 -13    apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Makefile.in	14 May 2002 08:37:17 -0000	1.66
  +++ Makefile.in	15 Jun 2002 04:41:52 -0000	1.67
  @@ -50,27 +50,27 @@
   	fi
   
   install: $(TARGET_LIB)
  -	if [ ! -d $(includedir) ]; then \
  -	    @APR_SOURCE_DIR@/build/mkdir.sh $(includedir); \
  +	if [ ! -d $(DESTDIR)$(includedir) ]; then \
  +	    @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(includedir); \
   	fi;
  -	cp -p $(top_srcdir)/include/*.h $(includedir)
  +	cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
   
   	if [ -n "$(top_blddir)" ]; then \
  -		cp -p $(top_blddir)/include/*.h $(includedir); \
  +		cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
   	fi;
   	
  -	if [ ! -d $(libdir) ]; then \
  -	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
  +	if [ ! -d $(DESTDIR)$(libdir) ]; then \
  +	    @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(libdir); \
   	fi;
  -	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
  -	$(LIBTOOL) --mode=install cp aprutil.exp $(libdir)
  -	if [ ! -d $(bindir) ]; then \
  -		@APR_SOURCE_DIR@/build/mkdir.sh $(bindir); \
  +	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
  +	$(LIBTOOL) --mode=install cp aprutil.exp $(DESTDIR)$(libdir)
  +	if [ ! -d $(DESTDIR)$(bindir) ]; then \
  +		@APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(bindir); \
   	fi;
  -	$(LIBTOOL) --mode=install cp apu-config $(bindir)
  -	chmod 755 $(bindir)/apu-config
  +	$(LIBTOOL) --mode=install cp apu-config $(DESTDIR)$(bindir)
  +	chmod 755 $(DESTDIR)$(bindir)/apu-config
   	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
  -		( cd $$i ; $(MAKE) install ); \
  +		( cd $$i ; $(MAKE) root=$(DESTDIR) install ); \
   	done
   
   $(TARGET_LIB):
  
  
  
  1.36      +9 -9      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Makefile.in	3 Jun 2002 15:25:11 -0000	1.35
  +++ Makefile.in	15 Jun 2002 04:41:52 -0000	1.36
  @@ -10,20 +10,20 @@
   include $(top_builddir)/build/rules.mk
   
   install:
  -	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
  -	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
  -	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
  -	@cp -p $(top_builddir)/server/httpd.exp $(libexecdir)
  +	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
  +	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
  +	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
  +	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
   	@for i in apxs apachectl dbmmanage; do \
   	    if test -f "$(builddir)/$$i"; then \
  -	        cp -p $$i $(sbindir); \
  -	        chmod 755 $(sbindir)/$$i; \
  +	        cp -p $$i $(DESTDIR)$(sbindir); \
  +	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
   	    fi ; \
   	done
   	@if test -f "$(builddir)/envvars-std"; then \
  -	    cp -p envvars-std $(sbindir); \
  -	    if test ! -f $(sbindir)/envvars; then \
  -	        cp -p envvars-std $(sbindir)/envvars ; \
  +	    cp -p envvars-std $(DESTDIR)$(sbindir); \
  +	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
  +	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
   	    fi ; \
   	fi
   
  
  
  

Mime
View raw message