Updated the NetWare makefiles to include the rotatelogs NLM and to copy

Bradley Nicholes · Bradley Nicholes · commit fe04f3e09133 · 2002-05-29T21:16:46.000Z
all of the support NLMs to a bin directory. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95365 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NWGNUmakefile b/NWGNUmakefile
@@ -308,8 +308,8 @@ install :: nlms FORCE
 	-copy STATUS                    $(INSTALL)\Apache2\*.*
 	-copy LICENSE                   $(INSTALL)\Apache2\*.*
 	-copy CHANGES                   $(INSTALL)\Apache2\*.*
-	-copy support\dbmmanage.in      $(INSTALL)\Apache2\dbmmanage.pl
-	-copy support\logresolve.pl.in  $(INSTALL)\Apache2\logresolve.pl
+	-copy support\dbmmanage.in      $(INSTALL)\Apache2\bin\dbmmanage.pl
+	-copy support\logresolve.pl.in  $(INSTALL)\Apache2\bin\logresolve.pl
 	-awk  -f build\mkconfnw.awk docs\conf\httpd-std.conf.in >$(INSTALL)\Apache2\conf\httpd.conf
 	-copy docs\conf\magic           $(INSTALL)\Apache2\conf\magic
 	-copy docs\conf\mime.types      $(INSTALL)\Apache2\conf\mime.types
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
@@ -189,27 +189,15 @@ INSTDEVDIRS := \
 
 INSTDIRS += \
 	$(INSTALL)\Apache2 \
+	$(INSTALL)\Apache2\bin \
 	$(INSTALL)\Apache2\cgi-bin \
 	$(INSTALL)\Apache2\conf \
 	$(INSTALL)\Apache2\error \
-	$(INSTALL)\Apache2\error\include \
 	$(INSTALL)\Apache2\htdocs \
 	$(INSTALL)\Apache2\icons \
-	$(INSTALL)\Apache2\icons\small \
 	$(INSTALL)\Apache2\logs \
 	$(INSTALL)\Apache2\man \
 	$(INSTALL)\Apache2\manual \
-	$(INSTALL)\Apache2\manual\developer \
-	$(INSTALL)\Apache2\manual\faq \
-	$(INSTALL)\Apache2\manual\howto \
-	$(INSTALL)\Apache2\manual\images \
-	$(INSTALL)\Apache2\manual\misc \
-	$(INSTALL)\Apache2\manual\mod \
-	$(INSTALL)\Apache2\manual\platform \
-	$(INSTALL)\Apache2\manual\programs \
-	$(INSTALL)\Apache2\manual\search \
-	$(INSTALL)\Apache2\manual\ssl \
-	$(INSTALL)\Apache2\manual\vhosts \
 	$(INSTALL)\Apache2\modules \
 
 #
diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile
@@ -156,6 +156,7 @@ TARGET_nlm = \
 	$(OBJDIR)/htdigest.nlm \
 	$(OBJDIR)/htdbm.nlm \
 	$(OBJDIR)/logres.nlm \
+	$(OBJDIR)/rotlogs.nlm \
 	$(EOLIST)
 
 #
@@ -232,7 +233,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-	copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\*.*
+	copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\bin\*.*
 
 #
 # Any specialized rules here

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ TARGET_nlm = \`
`156`	`156`	`$(OBJDIR)/htdigest.nlm \`
`157`	`157`	`$(OBJDIR)/htdbm.nlm \`
`158`	`158`	`$(OBJDIR)/logres.nlm \`
	`159`	`+ $(OBJDIR)/rotlogs.nlm \`
`159`	`160`	`$(EOLIST)`
`160`	`161`
`161`	`162`	`#`
`@@ -232,7 +233,7 @@ nlms :: libs $(TARGET_nlm)`
`232`	`233`	`# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)`
`233`	`234`	`#`
`234`	`235`	`install :: nlms FORCE`
`235`		`- copy $(OBJDIR)\.nlm $(INSTALL)\Apache2\.*`
	`236`	`+ copy $(OBJDIR)\.nlm $(INSTALL)\Apache2\bin\.*`
`236`	`237`
`237`	`238`	`#`
`238`	`239`	`# Any specialized rules here`