[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-httpd-dev
Subject:    Re: [PATCH] enable another basedir during 'make install' forNetWare
From:       Guenter Knauf <fuankg () apache ! org>
Date:       2007-01-22 20:39:45
Message-ID: tiKKiz65lVq5xNS6N7LbvaYarIlyrbsCgG6ETZequb7 () akmail
[Download RAW message or body]

This is a message in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.


Hi Brad,
> I think it cant break. If you look at apr\build\NWGNUenvironment.inc you
> can see that apr uses INSTALLBASE, and that gets set in any case. That t=
he
> test makefiles are affected is therefore an older outstanding issue, and
> the patch doesnt make it any more bad as it currently is - however I dou=
bt
> that someone does a 'make install' for getting the test samples in
> place...
Just had few minutes more - with these two patches the install for the tes=
t samples is also fixed now:
http://www.gknw.net/test/httpd_patches/apr_makefiles.diff
http://www.gknw.net/test/httpd_patches/apr-util_makefiles.diff

all patches for the 2.2.x line are also now up on my site:
http://www.gknw.net/test/httpd_patches/httpd-2.2.4_makefiles.diff
http://www.gknw.net/test/httpd_patches/apr-2.2.4_makefiles.diff
http://www.gknw.net/test/httpd_patches/apr-util-2.2.4_makefiles.diff
http://www.gknw.net/test/httpd_patches/2_mkconfNW.awk.diff

thanks, Guen.


["apr-util_makefiles.diff" (application/octet-stream)]

############################################################################# 
# Patch for enabling another base directory than the hardcoded 'Apache2'    #
# dirextory for NetWare - by G. Knauf                                       # 
# use inside source base dir with: patch -p 1 -i apr-util_makefiles.diff    # 
############################################################################# 
diff -ur apr-util.orig\test\NWGNUmakefile apr-util\test\NWGNUmakefile
--- apr-util.orig\test\NWGNUmakefile	Mon Jan 22 18:08:04 2007
+++ apr-util\test\NWGNUmakefile	Mon Jan 22 21:21:18 2007
@@ -243,7 +243,7 @@
 # correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-	  copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2
+	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
 
 #
 # Any specialized rules here

["apr_makefiles.diff" (application/octet-stream)]

############################################################################# 
# Patch for enabling another base directory than the hardcoded 'Apache2'    #
# dirextory for NetWare - by G. Knauf                                       # 
# use inside source base dir with: patch -p 1 -i apr_makefiles.diff         # 
############################################################################# 
diff -ur apr.orig\build\NWGNUenvironment.inc apr\build\NWGNUenvironment.inc
--- apr.orig\build\NWGNUenvironment.inc	Mon Jan 22 18:07:40 2007
+++ apr\build\NWGNUenvironment.inc	Mon Jan 22 18:19:52 2007
@@ -214,7 +214,12 @@
 endif
 
 ifdef DEST
-INSTALLBASE := $(INSTALL)\Apache2
+
+ifndef BASEDIR
+BASEDIR = Apache2
+endif
+
+INSTALLBASE := $(INSTALL)\$(BASEDIR)
 
 INSTDEVDIRS := \
     $(INSTDIRS) \
diff -ur apr.orig\test\NWGNUmakefile apr\test\NWGNUmakefile
--- apr.orig\test\NWGNUmakefile	Mon Jan 22 18:07:24 2007
+++ apr\test\NWGNUmakefile	Mon Jan 22 21:25:14 2007
@@ -249,7 +249,7 @@
 # correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-	  copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2
+	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
 
 #
 # Any specialized rules here


[prev in list] [next in list] [prev in thread] [next in thread]