wip/aolserver4/patches/patch-aa

   1 $NetBSD$
   2
   3 --- include/Makefile.global.in.orig     2003-06-03 12:08:20.000000000 +0000
   4 +++ include/Makefile.global.in
   5 @@ -40,6 +40,7 @@
   6  AOLSERVER      = @AOLSERVER@
   7  srcdir         = @SRCDIR@
   8
   9 +CP             = /bin/cp
  10  RM             = /bin/rm -f
  11  MKDIR          = /bin/mkdir -p
  12
  13 @@ -72,7 +73,7 @@ CFLAGS                += @CFLAGS_DEFAULT@ $(CFLAGS_WAR
  14  ifndef NSBUILD
  15      LDFLAGS    += -L$(AOLSERVER)/lib
  16      LIBS       += -lnsthread -lnsd
  17 -    INCDIR     = $(AOLSERVER)/include
  18 +    INCDIR     = $(AOLSERVER)/include/nsd/include
  19  else
  20      LDFLAGS    += -L../nsthread -L../nsd
  21      INCDIR     = ../include
  22 @@ -92,9 +93,9 @@ CCLIBS                = $(LIBS) @TCL_LD_FLAGS@
  23  # Install directories
  24  INSTBIN                = $(AOLSERVER)/bin
  25  INSTLIB                = $(AOLSERVER)/lib
  26 -INSTMOD                = $(AOLSERVER)/modules
  27 -INSTTCL                = $(AOLSERVER)/modules/tcl
  28 -INSTSRV                = $(AOLSERVER)/servers/server1
  29 +INSTMOD                = $(AOLSERVER)/share/nsd/modules
  30 +INSTTCL                = $(AOLSERVER)/share/nsd/modules/tcl
  31 +INSTSRV                = $(AOLSERVER)/share/nsd/servers/server1
  32  INSTSRVMOD     = $(INSTSRV)/modules
  33  INSTSRVPAG     = $(INSTSRV)/pages
  34