bnicholes 2003/11/21 15:45:04
Modified: . Tag: APR_0_9_BRANCH NWGNUmakefile
build Tag: APR_0_9_BRANCH NWGNUhead.inc
NWGNUenvironment.inc
Log:
Fix up the NetWare make files so that they copy the right headers and
libraries
for the installdev target
Revision Changes Path
No revision
No revision
1.16.2.2 +26 -2 apr/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/apr/NWGNUmakefile,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- NWGNUmakefile 2 Oct 2003 14:49:33 -0000 1.16.2.1
+++ NWGNUmakefile 21 Nov 2003 23:45:04 -0000 1.16.2.2
@@ -311,8 +311,32 @@
# Updated this target to create necessary directories and copy files to the
# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
#
-install :: nlms FORCE
- copy $(OBJDIR)\aprlib.nlm $(INSTALL)\Apache2\*.*
+install :: nlms $(INSTDIRS) FORCE
+ copy $(OBJDIR)\aprlib.nlm $(INSTALLBASE)\*.*
+ifndef DEST
+ -copy $(subst /,\,$(APR))\STATUS $(INSTALLBASE)\*.apr
+ -copy $(subst /,\,$(APR))\LICENSE $(INSTALLBASE)\*
+ -copy $(subst /,\,$(APR))\CHANGES $(INSTALLBASE)\*.apr
+ -copy $(subst /,\,$(APRUTIL))\STATUS $(INSTALLBASE)\*.apu
+ -copy $(subst /,\,$(APRUTIL))\CHANGES $(INSTALLBASE)\*.apu
+ @echo rem copying the docs directories > xc.bat
+ @echo xcopy docs $(INSTALLBASE)\docs\*.* /E /Y >> xc.bat
+ $(CMD) xc.bat
+endif
+
+$(INSTDIRS) ::
+ $(CHKNOT) [EMAIL PROTECTED] mkdir $@
+
+ifndef DEST
+installdev :: $(INSTDEVDIRS) FORCE
+ -copy $(subst /,\,$(APR))\include\*.h
$(INSTALLBASE)\include\*.*
+ -copy $(subst /,\,$(APRUTIL))\include\*.h
$(INSTALLBASE)\include\*.*
+ -copy $(subst /,\,$(APR))\*.imp
$(INSTALLBASE)\lib\*.*
+ -copy $(subst /,\,$(APR))\misc\netware\*.xdc
$(INSTALLBASE)\lib\*.*
+
+$(INSTDEVDIRS) ::
+ $(CHKNOT) [EMAIL PROTECTED] mkdir $@
+endif
#
# Any specialized rules here
No revision
No revision
1.1.2.1 +0 -10 apr/build/NWGNUhead.inc
Index: NWGNUhead.inc
===================================================================
RCS file: /home/cvs/apr/build/NWGNUhead.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- NWGNUhead.inc 1 Mar 2002 22:25:26 -0000 1.1
+++ NWGNUhead.inc 21 Nov 2003 23:45:04 -0000 1.1.2.1
@@ -36,16 +36,6 @@
$(TARGETS) :: $(SUBDIRS)
-install :: nlms $(INSTDIRS)
-
-installdev :: $(INSTDEVDIRS)
-
-$(INSTDIRS) ::
- $(CHKNOT) [EMAIL PROTECTED] mkdir $@
-
-$(INSTDEVDIRS) ::
- $(CHKNOT) [EMAIL PROTECTED] mkdir $@
-
endif #NO_LICENSE_FILE check
help :
1.9.2.1 +21 -4 apr/build/NWGNUenvironment.inc
Index: NWGNUenvironment.inc
===================================================================
RCS file: /home/cvs/apr/build/NWGNUenvironment.inc,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- NWGNUenvironment.inc 9 Jan 2003 16:54:37 -0000 1.9
+++ NWGNUenvironment.inc 21 Nov 2003 23:45:04 -0000 1.9.2.1
@@ -201,14 +201,31 @@
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
