diff options
| author | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2003-11-21 23:44:15 +0000 |
|---|---|---|
| committer | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2003-11-21 23:44:15 +0000 |
| commit | 14406d5132ed8e7df9532cef0297dd06565bbda7 (patch) | |
| tree | 28a3306122110c17d3013676b28f238d11f5ca33 /build | |
| parent | 9a19d440248c849145517f3ce4e2de13c051cfd4 (diff) | |
| download | libapr-14406d5132ed8e7df9532cef0297dd06565bbda7.tar.gz | |
Fix up the NetWare make files so that they copy the right headers and libraries
for the installdev target
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64782 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUenvironment.inc | 25 | ||||
| -rw-r--r-- | build/NWGNUhead.inc | 10 |
2 files changed, 21 insertions, 14 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 72997ff8c..44417d658 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -201,14 +201,31 @@ endif endif +ifdef DEST +INSTALLBASE := $(INSTALL)\Apache2 + +INSTDEVDIRS := \ + $(INSTDIRS) \ + $(INSTALLBASE) \ + $(INSTALLBASE)\include \ + $(INSTALLBASE)\lib \ + +INSTDIRS += \ + $(INSTALLBASE) \ + +else +INSTALLBASE := $(INSTALL)\apr + INSTDEVDIRS := \ $(INSTDIRS) \ - $(INSTALL)\Apache2 \ - $(INSTALL)\Apache2\include \ - $(INSTALL)\Apache2\lib \ + $(INSTALLBASE) \ + $(INSTALLBASE)\include \ + $(INSTALLBASE)\lib \ INSTDIRS += \ - $(INSTALL)\Apache2 \ + $(INSTALLBASE) \ + +endif # # Declare Command and tool macros here diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc index ac084d02b..444b2f364 100644 --- a/build/NWGNUhead.inc +++ b/build/NWGNUhead.inc @@ -36,16 +36,6 @@ all: $(SUBDIRS) libs nlms install $(TARGETS) :: $(SUBDIRS) -install :: nlms $(INSTDIRS) - -installdev :: $(INSTDEVDIRS) - -$(INSTDIRS) :: - $(CHKNOT) $@\NUL mkdir $@ - -$(INSTDEVDIRS) :: - $(CHKNOT) $@\NUL mkdir $@ - endif #NO_LICENSE_FILE check help : |