diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:33 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:33 +0100 |
| commit | ad14e19ad0400e289b06fb7728aea815e6ed49be (patch) | |
| tree | bd29489cafb04b303940169ae7b00c1171a5a34c /NWGNUmakefile | |
| parent | 02a0e3b89d2ea1b984365e692c910668d75c6dcd (diff) | |
| download | apache2-ad14e19ad0400e289b06fb7728aea815e6ed49be.tar.gz | |
Upstream tarball 2.2.12upstream/2.2.12
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 7cc5f138..018d7abf 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -1,4 +1,35 @@ # +# Define our required macro's if not already done. +# + +ifndef AP_WORK +export AP_WORK = $(CURDIR) +endif + +ifndef APR_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr" +export APR_WORK = $(AP_WORK)/srclib/apr +endif +endif +ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h" +$(error APR_WORK does not point to a valid APR source tree) +endif + +ifndef APU_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-util" +export APU_WORK = $(AP_WORK)/srclib/apr-util +endif +endif +ifndef APU_WORK +ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h" +export APU_WORK = $(APR_WORK) +endif +endif +ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h" +$(error APU_WORK does not point to a valid APU source tree) +endif + +# # Declare the sub-directories to be built here # @@ -41,7 +72,6 @@ XINCDIRS += \ $(AP_WORK)/server/mpm/NetWare \ $(AP_WORK)/srclib/pcre \ $(NWOS) \ - $(AP_WORK)/modules/ssl \ $(EOLIST) # @@ -321,7 +351,7 @@ nlms :: libs $(TARGET_nlm) # Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # -install :: nlms FORCE +install :: nlms instscripts FORCE -copy $(OBJDIR)\Apache2.nlm $(INSTALL)\$(BASEDIR)\*.* -copy ABOUT_APACHE $(INSTALL)\$(BASEDIR)\*.* -copy README $(INSTALL)\$(BASEDIR)\*.* @@ -386,4 +416,6 @@ vpath %.c os/netware:server/mpm/netware:srclib/pcre include $(AP_WORK)\build\NWGNUtail.inc +include $(AP_WORK)\build\NWGNUscripts.inc + |