You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Dean Gaudet <dg...@arctic.org> on 1997/03/11 21:46:07 UTC
[PATCH] handle multiple Configurations without warning
When building multiple server configs to avoid errors we have no
Configuration file. That forces the user to use "./Configure -file
Configuration.foobar". But the Makefile.tmpl has a dependency on
Configuration...
This patch rewrites that dependency according to whatever the -file
argument was.
Contrib is fine for me. (At this rate we've got enough material for a
1.3 ;)
Dean
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.81
diff -c -3 -r1.81 Configure
*** Configure 1997/02/25 21:04:41 1.81
--- Configure 1997/03/11 20:43:37
***************
*** 566,570 ****
# Now (finish) creating the makefiles
cat Makefile.config >> Makefile
! cat "$makefile_tmpl" >> Makefile
cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile
--- 566,570 ----
# Now (finish) creating the makefiles
cat Makefile.config >> Makefile
! sed -e "s#@@Configuration@@#$file#" "$makefile_tmpl" >>Makefile
cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
retrieving revision 1.41
diff -c -3 -r1.41 Makefile.tmpl
*** Makefile.tmpl 1997/02/25 20:56:38 1.41
--- Makefile.tmpl 1997/03/11 20:43:37
***************
*** 18,30 ****
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
! all: Configuration httpd
! Configuration: Configuration.tmpl
! @echo "Configuration older than Configuration.tmpl, or doesn't exist."
! @echo "Consider copying Configuration.tmpl to Configuration, editing and rerunning"
@echo "Configure."
! @echo "If not, you will at least have to touch Configuration."
@false
httpd: $(REGLIB) $(OBJS)
--- 18,30 ----
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
! all: @@Configuration@@ httpd
! @@Configuration@@: Configuration.tmpl
! @echo "@@Configuration@@ older than Configuration.tmpl, or doesn't exist."
! @echo "Consider copying Configuration.tmpl to @@Configuration@@, editing and rerunning"
@echo "Configure."
! @echo "If not, you will at least have to touch @@Configuration@@."
@false
httpd: $(REGLIB) $(OBJS)
Re: [PATCH] handle multiple Configurations without warning
Posted by Chuck Murcko <ch...@topsail.org>.
Dean Gaudet wrote:
>
> When building multiple server configs to avoid errors we have no
> Configuration file. That forces the user to use "./Configure -file
> Configuration.foobar". But the Makefile.tmpl has a dependency on
> Configuration...
>
> This patch rewrites that dependency according to whatever the -file
> argument was.
>
> Contrib is fine for me. (At this rate we've got enough material for a
> 1.3 ;)
>
+1 for wherever it goes. 1.2 is OK with me, since we're cleaning up the
build environment already.
--
chuck
Chuck Murcko
The Topsail Group, West Chester PA USA
chuck@topsail.org