diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-03-11 18:47:15 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-03-11 18:47:15 +0000 |
| commit | e7e98fa217bfd33191a534086770c1405b4bfa0c (patch) | |
| tree | 284054889f815e2f6a683f73e3c2dc6710eeda33 /build | |
| parent | b1fda72bfe47dcfb6f8d5ae5f5b9786501a7defb (diff) | |
| download | httpd-e7e98fa217bfd33191a534086770c1405b4bfa0c.tar.gz | |
NetWare build overhaul in order to compile on Linux.
Some more build fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080725 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUenvironment.inc | 13 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 8 |
2 files changed, 10 insertions, 11 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index c122b5eb38..3b4c8c95ef 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -50,10 +50,8 @@ $(error LDAPSDK does not point to a valid Novell CLDAP SDK) endif ifndef PCRESRC -ifeq "$(wildcard $(AP_WORK)/srclib/pcre/pcre-config.in)" "$(AP_WORK)/srclib/pcre/pcre-config.in" PCRESRC = $(AP_WORK)/srclib/pcre endif -endif ifneq "$(wildcard $(PCRESRC)/pcre-config.in)" "$(PCRESRC)/pcre-config.in" $(error PCRESRC does not point to a valid PCRE source tree) endif @@ -144,8 +142,8 @@ ifeq ($(findstring /sh,$(SHELL)),/sh) DEL = rm -f $1 RMDIR = rm -rf $1 MKDIR = mkdir -p $1 -COPY = cp -av $1 $2 -COPYR = cp -ar $1 $2 +COPY = -cp -av $1 $2 +COPYR = -cp -ar $1 $2 ECHONL = echo "" DL = ' CAT = cat @@ -160,8 +158,8 @@ RMDIR = $(shell if exist $(subst /,\,$1)\NUL deltree /y 2>NUL $(subst /,\,$1)) ECHONL = command /c echo. endif MKDIR = $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1)) -COPY = copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2) -COPYR = xcopy /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2) +COPY = -copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2) +COPYR = -xcopy /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2) CAT = type endif @@ -245,7 +243,6 @@ endif # -g generate debugging information # -O0 level 0 optimizations - ifeq "$(RELEASE)" "debug" CFLAGS += -g -O0 endif @@ -256,7 +253,6 @@ CFLAGS += -O4,p endif # -prefix pre_nw.h #include pre_nw.h for all files - CFLAGS += -prefix pre_nw.h @@ -329,6 +325,7 @@ INSTDIRS += \ $(INSTALL)/$(BASEDIR)/bin \ $(INSTALL)/$(BASEDIR)/cgi-bin \ $(INSTALL)/$(BASEDIR)/conf \ + $(INSTALL)/$(BASEDIR)/conf/extra \ $(INSTALL)/$(BASEDIR)/error \ $(INSTALL)/$(BASEDIR)/htdocs \ $(INSTALL)/$(BASEDIR)/icons \ diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index cdf91f53dc..30a1fd4e5c 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -22,7 +22,9 @@ FILES_prebuild_headers = \ $(PCRE)/pcre.h \ $(EOLIST) -nlms :: chkapr $(NWOS)/httpd.imp $(NWOS)/chartables.c +nlms :: libs $(NWOS)/httpd.imp + +libs :: chkapr $(NWOS)/chartables.c $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i @echo $(DL)GEN $@$(DL) @@ -58,11 +60,11 @@ $(PCRE)/%.h: $(PCRE)/%.hw ifneq "$(BUILDTOOL_AS_NLM)" "1" -$(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c $(FILES_prebuild_headers) +$(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c @echo $(DL)GEN $@$(DL) $< $@ -%.exe: $(PCRE)/%.c +%.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h @echo $(DL)Creating Build Helper $@$(DL) $(HOST_CC) $(HOST_CFLAGS) -DHAVE_CONFIG_H $< -o $@ |