diff options
72 files changed, 468 insertions, 454 deletions
@@ -55,8 +55,8 @@ ifdef PR_CLIENT_BUILD export:: rm -r -f $(DIST)/../public/nspr ifdef PR_CLIENT_BUILD_UNIX - rm -f $(DIST)/lib/libnspr.a - rm -f $(DIST)/bin/libnspr.$(DLL_SUFFIX) + rm -f $(libdir)/libnspr.a + rm -f $(bindir)/libnspr.$(DLL_SUFFIX) endif endif diff --git a/Makefile.in b/Makefile.in index f76b9cd3..6ab8d628 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,8 +63,8 @@ ifdef PR_CLIENT_BUILD export:: rm -r -f $(DIST)/../public/nspr ifdef PR_CLIENT_BUILD_UNIX - rm -f $(DIST)/lib/libnspr.a - rm -f $(DIST)/bin/libnspr.$(DLL_SUFFIX) + rm -f $(libdir)/libnspr.a + rm -f $(bindir)/libnspr.$(DLL_SUFFIX) endif endif diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index ae02b0d3..58a19ce5 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -1,7 +1,14 @@ +INCLUDED_AUTOCONF_MK = 1 USE_AUTOCONF = 1 MOZILLA_CLIENT = @MOZILLA_CLIENT@ DIST = @prefix@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +includedir = @includedir@ +libdir = @libdir@ + OBJDIR_NAME = @OBJDIR_NAME@ OBJDIR = @OBJDIR@ OBJ_SUFFIX = @OBJ_SUFFIX@ diff --git a/config/config.mk b/config/config.mk index 29e2b514..0a703678 100644 --- a/config/config.mk +++ b/config/config.mk @@ -177,6 +177,13 @@ MOZ_INCL = $(NSDEPTH)/dist/public/win16 MOZ_DIST = $(NSDEPTH)/dist/WIN16D_D.OBJ endif +# if not using autoconf, set these values accordingly +prefix = $(DIST) +exec_prefix = $(prefix) +bindir = $(prefix)/bin +includedir = $(prefix)/include +libdir = $(prefix)/lib + VPATH = $(OBJDIR) DEPENDENCIES = $(OBJDIR)/.md diff --git a/lib/ds/Makefile b/lib/ds/Makefile index e6e49487..6a4d679a 100644 --- a/lib/ds/Makefile +++ b/lib/ds/Makefile @@ -44,7 +44,7 @@ OPTIMIZER = endif endif -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include CSRCS = \ plarena.c \ @@ -61,16 +61,16 @@ HEADERS = \ ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) # OS_CFLAGS = $(OS_EXE_CFLAGS) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plds.res RESNAME=plds.rc OS_LIBS = user32.lib ifeq ($(OS_TARGET),WIN95) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else -EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib endif ifdef MOZ_DEBUG @@ -82,7 +82,7 @@ endif else ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else ifeq ($(OS_ARCH), AIX) @@ -93,9 +93,9 @@ OS_LIBS += -lc_r endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) endif endif endif @@ -164,22 +164,22 @@ endif # # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(HEADERS) $(DIST)/include - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(HEADERS) $(includedir) + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir) else - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(OS_ARCH), OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif ifeq ($(MOZ_BITS),16) diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in index d02c9b9b..a011a4c2 100644 --- a/lib/ds/Makefile.in +++ b/lib/ds/Makefile.in @@ -51,7 +51,7 @@ endif endif endif #!USE_AUTOCONF -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include CSRCS = \ plarena.c \ @@ -70,16 +70,16 @@ HEADERS := $(addprefix $(srcdir)/, $(HEADERS)) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) # OS_CFLAGS = $(OS_EXE_CFLAGS) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plds.res RESNAME=plds.rc OS_LIBS = user32.lib ifeq ($(OS_TARGET),WIN95) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else -EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib endif ifdef MOZ_DEBUG @@ -92,7 +92,7 @@ endif ifndef USE_AUTOCONF ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else ifeq ($(OS_ARCH), AIX) @@ -103,9 +103,9 @@ OS_LIBS += -lc_r endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) endif endif endif @@ -123,7 +123,7 @@ endif endif #!USE_AUTOCONF ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION) $(OS_LIBS) +EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS) endif LIBRARY_NAME = plds @@ -179,22 +179,22 @@ endif # # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(HEADERS) $(DIST)/include - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(HEADERS) $(includedir) + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir) else - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(OS_ARCH), OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif ifeq ($(MOZ_BITS),16) diff --git a/lib/libc/include/Makefile b/lib/libc/include/Makefile index 95915a0a..866a6b02 100644 --- a/lib/libc/include/Makefile +++ b/lib/libc/include/Makefile @@ -44,7 +44,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) include $(MOD_DEPTH)/config/rules.mk export:: $(HEADERS) - $(INSTALL) -m 444 $(HEADERS) $(DIST)/include + $(INSTALL) -m 444 $(HEADERS) $(includedir) ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL) endif diff --git a/lib/libc/include/Makefile.in b/lib/libc/include/Makefile.in index bfc54f14..e753b386 100644 --- a/lib/libc/include/Makefile.in +++ b/lib/libc/include/Makefile.in @@ -49,7 +49,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) include $(topsrcdir)/config/rules.mk export:: $(HEADERS) - $(INSTALL) -m 444 $(HEADERS) $(DIST)/include + $(INSTALL) -m 444 $(HEADERS) $(includedir) ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL) endif diff --git a/lib/libc/src/Makefile b/lib/libc/src/Makefile index d28f7a91..edd6d884 100644 --- a/lib/libc/src/Makefile +++ b/lib/libc/src/Makefile @@ -44,7 +44,7 @@ OPTIMIZER = endif endif -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) CSRCS =\ plvrsion.c \ @@ -70,15 +70,15 @@ RELEASE_LIBS = $(TARGETS) ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_TARGET), WIN16) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plc.res RESNAME=plc.rc ifeq ($(OS_TARGET),WIN95) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else -EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib endif ifdef MOZ_DEBUG @@ -90,7 +90,7 @@ endif else ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else ifeq ($(OS_ARCH), AIX) @@ -101,9 +101,9 @@ OS_LIBS += -lc_r endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) endif endif endif @@ -165,21 +165,21 @@ endif # # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir) else - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(OS_ARCH), OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif ifeq ($(MOZ_BITS),16) diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in index b4528756..c0919b41 100644 --- a/lib/libc/src/Makefile.in +++ b/lib/libc/src/Makefile.in @@ -52,7 +52,7 @@ endif endif endif #!USE_AUTOCONF -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) CSRCS =\ plvrsion.c \ @@ -78,15 +78,15 @@ RELEASE_LIBS = $(TARGETS) ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_TARGET), WIN16) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plc.res RESNAME=plc.rc ifeq ($(OS_TARGET),WIN95) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else -EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib +EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib endif ifdef MOZ_DEBUG @@ -99,7 +99,7 @@ endif ifndef USE_AUTOCONF ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else ifeq ($(OS_ARCH), AIX) @@ -110,9 +110,9 @@ OS_LIBS += -lc_r endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) +EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) endif endif endif @@ -130,7 +130,7 @@ endif endif #!USE_AUTOCONF ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION) $(OS_LIBS) +EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS) endif include $(topsrcdir)/config/rules.mk @@ -179,21 +179,21 @@ endif # # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir) else - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(OS_ARCH), OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif ifeq ($(MOZ_BITS),16) diff --git a/lib/msgc/include/Makefile b/lib/msgc/include/Makefile index 8dbab062..cf571ff2 100644 --- a/lib/msgc/include/Makefile +++ b/lib/msgc/include/Makefile @@ -45,7 +45,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) include $(MOD_DEPTH)/config/rules.mk export:: $(EXPORT_HEADERS) - $(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + $(INSTALL) -m 444 $(EXPORT_HEADERS) $(includedir) ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL) endif diff --git a/lib/msgc/include/Makefile.in b/lib/msgc/include/Makefile.in index 223d89c3..344b9c95 100644 --- a/lib/msgc/include/Makefile.in +++ b/lib/msgc/include/Makefile.in @@ -50,7 +50,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) include $(topsrcdir)/config/rules.mk export:: $(EXPORT_HEADERS) - $(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + $(INSTALL) -m 444 $(EXPORT_HEADERS) $(includedir) ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL) endif diff --git a/lib/msgc/src/Makefile b/lib/msgc/src/Makefile index cc09a39e..7db7d679 100644 --- a/lib/msgc/src/Makefile +++ b/lib/msgc/src/Makefile @@ -44,7 +44,7 @@ OPTIMIZER = endif endif -INCLUDES = -I$(DIST)/include -I../include +INCLUDES = -I$(includedir) -I../include CSRCS = prgcapi.c prmsgc.c @@ -66,13 +66,13 @@ NSPR_VERSION = $(MOD_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) -EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).lib else DLLBASE=/BASE:0x30000000 #RES=$(OBJDIR)/ds.res #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc #OS_LIBS = user32.lib -EXTRA_LIBS = $(DIST)/lib/libnspr$(NSPR_VERSION).lib +EXTRA_LIBS = $(libdir)/libnspr$(NSPR_VERSION).lib ifdef MOZ_DEBUG ifdef GLOWCODE @@ -83,7 +83,7 @@ endif else ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).$(LIB_SUFFIX) else ifeq ($(OS_ARCH), AIX) @@ -94,9 +94,9 @@ OS_LIBS += -lc_r endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)_shr +EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION)_shr else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION) +EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION) endif endif endif @@ -120,14 +120,14 @@ RELEASE_LIBS = $(TARGETS) include $(MOD_DEPTH)/config/rules.mk # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in index 593262ec..eff3b2c2 100644 --- a/lib/msgc/src/Makefile.in +++ b/lib/msgc/src/Makefile.in @@ -49,7 +49,7 @@ OPTIMIZER = endif endif -INCLUDES = -I$(DIST)/include -I../include +INCLUDES = -I$(includedir) -I../include CSRCS = prgcapi.c prmsgc.c @@ -71,13 +71,13 @@ NSPR_VERSION = $(MOD_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) -EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).lib +EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).lib else DLLBASE=/BASE:0x30000000 #RES=$(OBJDIR)/ds.res #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc #OS_LIBS = user32.lib -EXTRA_LIBS = $(DIST)/lib/libnspr$(NSPR_VERSION).lib +EXTRA_LIBS = $(libdir)/libnspr$(NSPR_VERSION).lib ifdef MOZ_DEBUG ifdef GLOWCODE @@ -88,7 +88,7 @@ endif else ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).$(LIB_SUFFIX) +EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).$(LIB_SUFFIX) else ifeq ($(OS_ARCH), AIX) @@ -99,9 +99,9 @@ OS_LIBS += -lc_r endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)_shr +EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION)_shr else -EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION) +EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION) endif endif endif @@ -125,14 +125,14 @@ RELEASE_LIBS = $(TARGETS) include $(topsrcdir)/config/rules.mk # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib diff --git a/lib/msgc/tests/Makefile b/lib/msgc/tests/Makefile index e3ffbb83..5a2f5238 100644 --- a/lib/msgc/tests/Makefile +++ b/lib/msgc/tests/Makefile @@ -58,11 +58,11 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) NSPR_VERSION = $(MOD_VERSION) GC_VERSION = $(MOD_VERSION) LIBPR = -lnspr$(NSPR_VERSION) @@ -71,23 +71,23 @@ LIBGC = -lmsgc$(GC_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib - LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC = $(libdir)/plc$(NSPR_VERSION).lib + LIBGC= $(libdir)/msgc$(GC_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) - LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX) - LIBGC= $(DIST)/lib/libmsgc$(GC_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) + LIBPLC = $(libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX) + LIBGC= $(libdir)/libmsgc$(GC_VERSION).$(LIB_SUFFIX) endif endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib - LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC = $(libdir)/plc$(NSPR_VERSION).lib + LIBGC= $(libdir)/msgc$(GC_VERSION).lib else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -98,7 +98,7 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared +LDOPTS += -rpath $(PWD)/$(libdir) -rdata_shared # For 6.x machines, include this flag ifeq ($(basename $(OS_RELEASE)),6) @@ -115,22 +115,22 @@ ifeq ($(OS_ARCH), OSF1) # I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so # we do static linking. ifeq ($(OS_RELEASE), V3.2) - LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a - LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a - LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a + LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a + LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a + LIBGC = $(libdir)/libmsgc$(GC_VERSION).a EXTRA_LIBS = -lc_r else - LDOPTS += -rpath $(PWD)/$(DIST)/lib + LDOPTS += -rpath $(PWD)/$(libdir) endif endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -z -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -z -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) LIBPR = -lnspr$(NSPR_VERSION)_shr LIBPLC = -lplc$(NSPR_VERSION)_shr @@ -145,9 +145,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -174,16 +174,16 @@ EXTRA_LIBS = $(OS_LIBS) # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a -LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a -LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a +LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a +LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a +LIBGC = $(libdir)/libmsgc$(GC_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -193,7 +193,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), Linux) @@ -209,7 +209,7 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH),SINIX) @@ -217,11 +217,11 @@ EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH),BSD_OS) @@ -262,7 +262,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(NSPR_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(NSPR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/lib/msgc/tests/Makefile.in b/lib/msgc/tests/Makefile.in index 0940e905..1287e5cb 100644 --- a/lib/msgc/tests/Makefile.in +++ b/lib/msgc/tests/Makefile.in @@ -63,11 +63,11 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) NSPR_VERSION = $(MOD_VERSION) GC_VERSION = $(MOD_VERSION) LIBPR = -lnspr$(NSPR_VERSION) @@ -76,23 +76,23 @@ LIBGC = -lmsgc$(GC_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib - LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC = $(libdir)/plc$(NSPR_VERSION).lib + LIBGC= $(libdir)/msgc$(GC_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) - LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX) - LIBGC= $(DIST)/lib/libmsgc$(GC_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) + LIBPLC = $(libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX) + LIBGC= $(libdir)/libmsgc$(GC_VERSION).$(LIB_SUFFIX) endif endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib - LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC = $(libdir)/plc$(NSPR_VERSION).lib + LIBGC= $(libdir)/msgc$(GC_VERSION).lib else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -103,7 +103,7 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared +LDOPTS += -rpath $(PWD)/$(libdir) -rdata_shared # For 6.x machines, include this flag ifeq ($(basename $(OS_RELEASE)),6) @@ -120,22 +120,22 @@ ifeq ($(OS_ARCH), OSF1) # I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so # we do static linking. ifeq ($(OS_RELEASE), V3.2) - LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a - LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a - LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a + LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a + LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a + LIBGC = $(libdir)/libmsgc$(GC_VERSION).a EXTRA_LIBS = -lc_r else - LDOPTS += -rpath $(PWD)/$(DIST)/lib + LDOPTS += -rpath $(PWD)/$(libdir) endif endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -z -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -z -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) LIBPR = -lnspr$(NSPR_VERSION)_shr LIBPLC = -lplc$(NSPR_VERSION)_shr @@ -150,9 +150,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -179,16 +179,16 @@ EXTRA_LIBS = $(OS_LIBS) # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a -LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a -LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a +LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a +LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a +LIBGC = $(libdir)/libmsgc$(GC_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -198,7 +198,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), Linux) @@ -214,7 +214,7 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH),SINIX) @@ -222,11 +222,11 @@ EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH),BSD_OS) @@ -267,7 +267,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(NSPR_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(NSPR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/lib/prstreams/Makefile b/lib/prstreams/Makefile index 2afb50d8..b26daba5 100644 --- a/lib/prstreams/Makefile +++ b/lib/prstreams/Makefile @@ -64,7 +64,7 @@ ifeq ($(OS_ARCH), BeOS) CFLAGS += -frtti -fexceptions endif -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) HEADERS = $(wildcard *.h) @@ -80,24 +80,24 @@ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_S ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib + EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/prstrms.res RESNAME=prstrms.rc OS_LIBS = user32.lib ifeq ($(OS_TARGET), WIN95) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib + EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else - EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib + EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib endif endif else ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) + EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) -lstdcpp + EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -lstdcpp endif else ifeq ($(OS_ARCH), AIX) @@ -119,9 +119,9 @@ else endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr + EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr else - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) + EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) endif endif endif @@ -137,7 +137,7 @@ ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif ifeq ($(OS_ARCH),BeOS) - EXTRA_LIBS = -lstdc++.r4 -L$(DIST)/lib -lnspr$(MOD_VERSION) + EXTRA_LIBS = -lstdc++.r4 -L$(libdir) -lnspr$(MOD_VERSION) endif ifeq ($(OS_ARCH), UNIXWARE) @@ -195,20 +195,20 @@ endif # export:: $(TARGETS) $(HEADERS) - $(INSTALL) -m 444 $(HEADERS) $(DIST)/include - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(HEADERS) $(includedir) + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifeq ($(OS_ARCH),OS2) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/bin + $(INSTALL) -m 444 $(TARGETS) $(bindir) endif ifeq ($(OS_ARCH),HP-UX) ifdef SHARED_LIBRARY - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) endif endif ifeq ($(OS_ARCH),OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir) ifdef SHARED_LIBRARY - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in index 36fa9c99..ef6c4fb7 100644 --- a/lib/prstreams/Makefile.in +++ b/lib/prstreams/Makefile.in @@ -71,7 +71,7 @@ ifeq ($(OS_ARCH), BeOS) endif endif # !USE_AUTOCONF -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) HEADERS = $(wildcard $(srcdir)/*.h) @@ -88,24 +88,24 @@ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_S ifndef USE_AUTOCONF ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib + EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/prstrms.res RESNAME=prstrms.rc OS_LIBS = user32.lib ifeq ($(OS_TARGET), WIN95) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib + EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib else - EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib + EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib endif endif else ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) + EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) else - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) -lstdcpp + EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -lstdcpp endif else ifeq ($(OS_ARCH), AIX) @@ -127,9 +127,9 @@ else endif endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr + EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr else - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) + EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) endif endif endif @@ -145,7 +145,7 @@ ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif ifeq ($(OS_ARCH),BeOS) - EXTRA_LIBS = -lstdc++.r4 -L$(DIST)/lib -lnspr$(MOD_VERSION) + EXTRA_LIBS = -lstdc++.r4 -L$(libdir) -lnspr$(MOD_VERSION) endif ifeq ($(OS_ARCH), UNIXWARE) @@ -154,7 +154,7 @@ endif endif # !USE_AUTOCONF ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION) +EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) endif LIBRARY_NAME = prstrms @@ -208,20 +208,20 @@ endif # export:: $(TARGETS) $(HEADERS) - $(INSTALL) -m 444 $(HEADERS) $(DIST)/include - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(HEADERS) $(includedir) + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifeq ($(OS_ARCH),OS2) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/bin + $(INSTALL) -m 444 $(TARGETS) $(bindir) endif ifeq ($(OS_ARCH),HP-UX) ifdef SHARED_LIBRARY - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) endif endif ifeq ($(OS_ARCH),OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir) ifdef SHARED_LIBRARY - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif diff --git a/lib/prstreams/tests/testprstrm/Makefile b/lib/prstreams/tests/testprstrm/Makefile index 9f7c3595..75927a11 100644 --- a/lib/prstreams/tests/testprstrm/Makefile +++ b/lib/prstreams/tests/testprstrm/Makefile @@ -57,26 +57,26 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPRSTRMS = -lprstrms$(MOD_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX) else - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).$(LIB_SUFFIX) endif endif endif @@ -84,8 +84,8 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX) else LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp endif @@ -96,20 +96,20 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) LIBPR = -lnspr$(MOD_VERSION)_shr LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr @@ -123,9 +123,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) # CC on SunOS 5.4 and 5.5.x need to link with -lthread or -lpthread # (or use the -mt switch) even though we already linked with these # system libraries when we built libnspr.so. @@ -142,8 +142,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a -LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).a +LIBPR = $(libdir)/libnspr$(MOD_VERSION).a +LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -153,7 +153,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), SCOOS) @@ -163,11 +163,11 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -200,7 +200,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/lib/prstreams/tests/testprstrm/Makefile.in b/lib/prstreams/tests/testprstrm/Makefile.in index c98f2c83..30119b34 100644 --- a/lib/prstreams/tests/testprstrm/Makefile.in +++ b/lib/prstreams/tests/testprstrm/Makefile.in @@ -62,26 +62,26 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPRSTRMS = -lprstrms$(MOD_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX) else - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).$(LIB_SUFFIX) endif endif endif @@ -89,8 +89,8 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX) else LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp endif @@ -101,20 +101,20 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) LIBPR = -lnspr$(MOD_VERSION)_shr LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr @@ -128,9 +128,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) # CC on SunOS 5.4 and 5.5.x need to link with -lthread or -lpthread # (or use the -mt switch) even though we already linked with these # system libraries when we built libnspr.so. @@ -147,8 +147,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a -LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).a +LIBPR = $(libdir)/libnspr$(MOD_VERSION).a +LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -158,7 +158,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), SCOOS) @@ -168,11 +168,11 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -205,7 +205,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/lib/tests/Makefile b/lib/tests/Makefile index 1712288c..288b0b6a 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -63,30 +63,30 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPLC = -lplc$(MOD_VERSION) LIBPLDS = -lplds$(MOD_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib - LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC= $(libdir)/plc$(MOD_VERSION).lib + LIBPLDS= $(libdir)/plds$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) else - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(libdir)/libplds$(MOD_VERSION).$(LIB_SUFFIX) endif endif endif @@ -94,9 +94,9 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib - LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC = $(libdir)/plc$(MOD_VERSION).lib + LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -107,14 +107,14 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), Linux) ifeq ($(OS_RELEASE), 1.2) EXTRA_LIBS = -ldl else - LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -rpath $(PWD)/$(libdir) ifeq ($(USE_PTHREADS),1) EXTRA_LIBS = -lpthread endif @@ -122,16 +122,16 @@ ifeq ($(OS_ARCH), Linux) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread +LDOPTS += -rpath $(PWD)/$(libdir) -lpthread endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib LIBPR = -lnspr$(MOD_VERSION)_shr LIBPLC = -lplc$(MOD_VERSION)_shr endif @@ -140,9 +140,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -170,7 +170,7 @@ EXTRA_LIBS = -lsocket -lnsl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -203,7 +203,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 28f6323a..29188e71 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -68,30 +68,30 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPLC = -lplc$(MOD_VERSION) LIBPLDS = -lplds$(MOD_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib - LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC= $(libdir)/plc$(MOD_VERSION).lib + LIBPLDS= $(libdir)/plds$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) else - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(libdir)/libplds$(MOD_VERSION).$(LIB_SUFFIX) endif endif endif @@ -99,9 +99,9 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib - LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC = $(libdir)/plc$(MOD_VERSION).lib + LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -112,14 +112,14 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), Linux) ifeq ($(OS_RELEASE), 1.2) EXTRA_LIBS = -ldl else - LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -rpath $(PWD)/$(libdir) ifeq ($(USE_PTHREADS),1) EXTRA_LIBS = -lpthread endif @@ -127,16 +127,16 @@ ifeq ($(OS_ARCH), Linux) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread +LDOPTS += -rpath $(PWD)/$(libdir) -lpthread endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib LIBPR = -lnspr$(MOD_VERSION)_shr LIBPLC = -lplc$(MOD_VERSION)_shr endif @@ -145,9 +145,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -175,7 +175,7 @@ EXTRA_LIBS = -lsocket -lnsl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -208,7 +208,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/include/Makefile b/pr/include/Makefile index cae6d0a1..a95ee26d 100644 --- a/pr/include/Makefile +++ b/pr/include/Makefile @@ -48,7 +48,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) include $(MOD_DEPTH)/config/rules.mk export:: $(RELEASE_HEADERS) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include + $(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir) ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL) endif diff --git a/pr/include/Makefile.in b/pr/include/Makefile.in index 439c3757..26c0abd5 100644 --- a/pr/include/Makefile.in +++ b/pr/include/Makefile.in @@ -52,7 +52,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) include $(topsrcdir)/config/rules.mk export:: $(RELEASE_HEADERS) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include + $(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir) ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL) endif diff --git a/pr/include/md/Makefile b/pr/include/md/Makefile index dcf7e093..18489752 100644 --- a/pr/include/md/Makefile +++ b/pr/include/md/Makefile @@ -176,19 +176,19 @@ MDCPUCFG_H = _beos.cfg endif export:: $(MDCPUCFG_H) - $(INSTALL) -m 444 $(MDCPUCFG_H) $(DIST)/include + $(INSTALL) -m 444 $(MDCPUCFG_H) $(includedir) ifeq ($(MOZ_BITS),16) - cp $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h + cp $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h $(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL) - mv -f $(DIST)/include/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h + mv -f $(includedir)/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h else ifneq ($(OS_ARCH),OpenVMS) - mv -f $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h + mv -f $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h else # mv'ing a link causes the file itself to move, not the link. - rm -f $(DIST)/include/$(MDCPUCFG_H) - rm -f $(DIST)/include/prcpucfg.h - ln -fs `pwd`/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h + rm -f $(includedir)/$(MDCPUCFG_H) + rm -f $(includedir)/prcpucfg.h + ln -fs `pwd`/$(MDCPUCFG_H) $(includedir)/prcpucfg.h endif endif diff --git a/pr/include/md/Makefile.in b/pr/include/md/Makefile.in index 6bbccf9a..e76508f8 100644 --- a/pr/include/md/Makefile.in +++ b/pr/include/md/Makefile.in @@ -188,19 +188,19 @@ endif # ! USE_AUTOCONF export:: $(MDCPUCFG_H) ifeq ($(MOZ_BITS),16) - cp $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h + cp $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h $(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL) - mv -f $(DIST)/include/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h + mv -f $(includedir)/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h else - $(INSTALL) -m 444 $(CONFIGS) $(DIST)/include/md - $(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(DIST)/include + $(INSTALL) -m 444 $(CONFIGS) $(includedir)/md + $(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(includedir) ifneq ($(OS_ARCH),OpenVMS) - mv -f $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h + mv -f $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h else # mv'ing a link causes the file itself to move, not the link. - rm -f $(DIST)/include/$(MDCPUCFG_H) - rm -f $(DIST)/include/prcpucfg.h - ln -fs `pwd`/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h + rm -f $(includedir)/$(MDCPUCFG_H) + rm -f $(includedir)/prcpucfg.h + ln -fs `pwd`/$(MDCPUCFG_H) $(includedir)/prcpucfg.h endif endif diff --git a/pr/include/obsolete/Makefile b/pr/include/obsolete/Makefile index 55abf328..d71915d9 100644 --- a/pr/include/obsolete/Makefile +++ b/pr/include/obsolete/Makefile @@ -46,7 +46,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete include $(MOD_DEPTH)/config/rules.mk export:: $(RELEASE_HEADERS) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/obsolete + $(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/obsolete ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/obsolete endif diff --git a/pr/include/obsolete/Makefile.in b/pr/include/obsolete/Makefile.in index eca33f68..8757cb3d 100644 --- a/pr/include/obsolete/Makefile.in +++ b/pr/include/obsolete/Makefile.in @@ -51,7 +51,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete include $(topsrcdir)/config/rules.mk export:: $(RELEASE_HEADERS) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/obsolete + $(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/obsolete ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/obsolete endif diff --git a/pr/include/private/Makefile b/pr/include/private/Makefile index 39683a3f..7444257b 100644 --- a/pr/include/private/Makefile +++ b/pr/include/private/Makefile @@ -45,7 +45,7 @@ HEADERS = $(RELEASE_HEADERS) pprmwait.h primpl.h include $(MOD_DEPTH)/config/rules.mk export:: $(RELEASE_HEADERS) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/private + $(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/private ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/private endif diff --git a/pr/include/private/Makefile.in b/pr/include/private/Makefile.in index 7e4d2bd9..b03bcd3b 100644 --- a/pr/include/private/Makefile.in +++ b/pr/include/private/Makefile.in @@ -52,7 +52,7 @@ HEADERS = $(RELEASE_HEADERS) $(srcdir)/pprmwait.h $(srcdir)/primpl.h include $(topsrcdir)/config/rules.mk export:: $(RELEASE_HEADERS) - $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/private + $(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/private ifeq ($(MOZ_BITS),16) $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/private endif diff --git a/pr/src/Makefile b/pr/src/Makefile index 1e556025..1ec6195c 100644 --- a/pr/src/Makefile +++ b/pr/src/Makefile @@ -162,7 +162,7 @@ endif endif ifdef GC_LEAK_DETECTOR -OS_LIBS += -L$(DIST)/lib -lboehm +OS_LIBS += -L$(libdir) -lboehm endif # @@ -377,7 +377,7 @@ endif # Version information generation (begin) # ECHO = echo -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private TINC = $(OBJDIR)/_pr_bld.h ifeq ($(OS_TARGET),OS2) @@ -427,21 +427,21 @@ endif # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir), # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir) else - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(OS_ARCH), OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif ifeq ($(MOZ_BITS),16) diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 80d7397f..45278134 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -163,7 +163,7 @@ OS_LIBS = -lsocket -lnsl -lgen -lresolv endif ifdef GC_LEAK_DETECTOR -OS_LIBS += -L$(DIST)/lib -lboehm +OS_LIBS += -L$(libdir) -lboehm endif endif # USE_AUTOCONF @@ -398,7 +398,7 @@ endif # Version information generation (begin) # ECHO = echo -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private TINC = $(OBJDIR)/_pr_bld.h ifeq ($(OS_TARGET),OS2) @@ -448,21 +448,21 @@ endif # -# The Client build wants the shared libraries in $(DIST)/bin, +# The Client build wants the shared libraries in $(bindir) # so we also install them there. # export:: $(TARGETS) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(TARGETS) $(libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir) else - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir) endif ifeq ($(OS_ARCH), OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir) endif endif ifeq ($(MOZ_BITS),16) diff --git a/pr/src/bthreads/Makefile b/pr/src/bthreads/Makefile index 90d9b49d..14dbcc28 100644 --- a/pr/src/bthreads/Makefile +++ b/pr/src/bthreads/Makefile @@ -43,7 +43,7 @@ CSRCS += $(BTCSRCS) TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private include $(MOD_DEPTH)/config/rules.mk diff --git a/pr/src/bthreads/Makefile.in b/pr/src/bthreads/Makefile.in index 87669355..b9e24342 100644 --- a/pr/src/bthreads/Makefile.in +++ b/pr/src/bthreads/Makefile.in @@ -48,7 +48,7 @@ CSRCS += $(BTCSRCS) TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private include $(topsrcdir)/config/rules.mk diff --git a/pr/src/cplus/Makefile b/pr/src/cplus/Makefile index b91dd7d6..b874f2a8 100644 --- a/pr/src/cplus/Makefile +++ b/pr/src/cplus/Makefile @@ -55,7 +55,7 @@ OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX))) TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/cplus/Makefile.in b/pr/src/cplus/Makefile.in index 591c4654..a5a8586f 100644 --- a/pr/src/cplus/Makefile.in +++ b/pr/src/cplus/Makefile.in @@ -59,7 +59,7 @@ OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX))) TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) include $(topsrcdir)/config/rules.mk diff --git a/pr/src/cplus/tests/Makefile b/pr/src/cplus/tests/Makefile index 6c29d122..35161bee 100644 --- a/pr/src/cplus/tests/Makefile +++ b/pr/src/cplus/tests/Makefile @@ -64,16 +64,16 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I.. -I$(DIST)/include +INCLUDES = -I.. -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPL = -lplc$(MOD_VERSION) ifeq ($(OS_ARCH), IRIX) - LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared + LDOPTS += -rpath $(PWD)/$(libdir) -rdata_shared # For 6.x machines, include this flag ifeq ($(basename $(OS_RELEASE)),6) ifeq ($(USE_N32),1) @@ -94,9 +94,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC - LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else - LDOPTS += -R $(PWD)/$(DIST)/lib + LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -120,20 +120,20 @@ endif # SunOS ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPL = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPL = $(libdir)/plc$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPL = $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPL = $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) endif endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC = $(libdir)/plc$(MOD_VERSION).lib else LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp endif @@ -144,16 +144,16 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), HP-UX) - LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib + LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) - LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib + LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) LIBPR = -lnspr$(MOD_VERSION)_shr LIBPLC = -lplc$(MOD_VERSION)_shr @@ -167,7 +167,7 @@ ifeq ($(OS_ARCH), Linux) ifeq ($(OS_RELEASE), 1.2) EXTRA_LIBS = -ldl else - LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -rpath $(PWD)/$(libdir) ifeq ($(USE_PTHREADS),1) EXTRA_LIBS = -lpthread endif @@ -178,8 +178,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a -LIBPL = $(DIST)/lib/libplc$(MOD_VERSION).a +LIBPR = $(libdir)/libnspr$(MOD_VERSION).a +LIBPL = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -189,7 +189,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), SCO_SV) @@ -199,11 +199,11 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -236,7 +236,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/src/cplus/tests/Makefile.in b/pr/src/cplus/tests/Makefile.in index 71e038d3..ef848677 100644 --- a/pr/src/cplus/tests/Makefile.in +++ b/pr/src/cplus/tests/Makefile.in @@ -69,16 +69,16 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I.. -I$(DIST)/include +INCLUDES = -I.. -I$(includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPL = -lplc$(MOD_VERSION) ifeq ($(OS_ARCH), IRIX) - LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared + LDOPTS += -rpath $(PWD)/$(libdir) -rdata_shared # For 6.x machines, include this flag ifeq ($(basename $(OS_RELEASE)),6) ifeq ($(USE_N32),1) @@ -99,9 +99,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC - LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else - LDOPTS += -R $(PWD)/$(DIST)/lib + LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -125,20 +125,20 @@ endif # SunOS ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPL = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPL = $(libdir)/plc$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPL = $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPL = $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) endif endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC = $(libdir)/plc$(MOD_VERSION).lib else LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp endif @@ -149,16 +149,16 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), HP-UX) - LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib + LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) - LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib + LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) LIBPR = -lnspr$(MOD_VERSION)_shr LIBPLC = -lplc$(MOD_VERSION)_shr @@ -172,7 +172,7 @@ ifeq ($(OS_ARCH), Linux) ifeq ($(OS_RELEASE), 1.2) EXTRA_LIBS = -ldl else - LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -rpath $(PWD)/$(libdir) ifeq ($(USE_PTHREADS),1) EXTRA_LIBS = -lpthread endif @@ -183,8 +183,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a -LIBPL = $(DIST)/lib/libplc$(MOD_VERSION).a +LIBPR = $(libdir)/libnspr$(MOD_VERSION).a +LIBPL = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -194,7 +194,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), SCO_SV) @@ -204,11 +204,11 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -241,7 +241,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/src/io/Makefile b/pr/src/io/Makefile index 51674d63..b911835e 100644 --- a/pr/src/io/Makefile +++ b/pr/src/io/Makefile @@ -70,7 +70,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/io/Makefile.in b/pr/src/io/Makefile.in index 54b22063..6e450286 100644 --- a/pr/src/io/Makefile.in +++ b/pr/src/io/Makefile.in @@ -75,7 +75,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/linking/Makefile b/pr/src/linking/Makefile index 1691ba86..97484223 100644 --- a/pr/src/linking/Makefile +++ b/pr/src/linking/Makefile @@ -50,7 +50,7 @@ CSRCS = \ TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/linking/Makefile.in b/pr/src/linking/Makefile.in index 56452560..79da9850 100644 --- a/pr/src/linking/Makefile.in +++ b/pr/src/linking/Makefile.in @@ -56,7 +56,7 @@ CSRCS = \ TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/malloc/Makefile b/pr/src/malloc/Makefile index b4d54e7b..6dffc690 100644 --- a/pr/src/malloc/Makefile +++ b/pr/src/malloc/Makefile @@ -46,7 +46,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/malloc/Makefile.in b/pr/src/malloc/Makefile.in index b168ffb0..8f90ca9f 100644 --- a/pr/src/malloc/Makefile.in +++ b/pr/src/malloc/Makefile.in @@ -51,7 +51,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/Makefile b/pr/src/md/Makefile index d978d9ee..5ab37620 100644 --- a/pr/src/md/Makefile +++ b/pr/src/md/Makefile @@ -65,7 +65,7 @@ CSRCS = \ TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/Makefile.in b/pr/src/md/Makefile.in index bfa8cf24..b1f19c0f 100644 --- a/pr/src/md/Makefile.in +++ b/pr/src/md/Makefile.in @@ -74,7 +74,7 @@ CSRCS = \ TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/beos/Makefile b/pr/src/md/beos/Makefile index c2480592..380fb370 100644 --- a/pr/src/md/beos/Makefile +++ b/pr/src/md/beos/Makefile @@ -40,7 +40,7 @@ CSRCS += $(MDCSRCS) TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/beos/Makefile.in b/pr/src/md/beos/Makefile.in index 4dc37e7a..e15846e9 100644 --- a/pr/src/md/beos/Makefile.in +++ b/pr/src/md/beos/Makefile.in @@ -46,7 +46,7 @@ CSRCS += $(MDCSRCS) TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/os2/Makefile b/pr/src/md/os2/Makefile index e253ef0c..2bc99a0f 100644 --- a/pr/src/md/os2/Makefile +++ b/pr/src/md/os2/Makefile @@ -55,7 +55,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/os2/Makefile.in b/pr/src/md/os2/Makefile.in index e97b7ff6..28d0cad9 100644 --- a/pr/src/md/os2/Makefile.in +++ b/pr/src/md/os2/Makefile.in @@ -60,7 +60,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/unix/Makefile b/pr/src/md/unix/Makefile index 9045e51e..40481474 100644 --- a/pr/src/md/unix/Makefile +++ b/pr/src/md/unix/Makefile @@ -303,7 +303,7 @@ ifeq ($(OS_ARCH),SunOS) endif endif -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ @@ -313,7 +313,7 @@ export:: $(TARGETS) #ifeq ($(OS_ARCH),AIX) #ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE))) #ifneq ($(USE_PTHREADS), 1) -# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(DIST)/lib +# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(libdir) #endif #endif #endif @@ -323,7 +323,7 @@ ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(OS_TEST),sun4u) $(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS) $(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS) - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir) $(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES) ifeq ($(USE_64),1) diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index e1e634e5..e4aee01a 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -324,7 +324,7 @@ TARGETS = $(OBJS) endif # ! USE_AUTOCONF -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ @@ -334,7 +334,7 @@ export:: $(TARGETS) #ifeq ($(OS_ARCH),AIX) #ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE))) #ifneq ($(USE_PTHREADS), 1) -# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(DIST)/lib +# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(libdir) #endif #endif #endif @@ -345,7 +345,7 @@ ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(OS_TEST),sun4u) $(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS) $(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS) - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir) $(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES) ifeq ($(USE_64),1) diff --git a/pr/src/md/windows/Makefile b/pr/src/md/windows/Makefile index 26e82913..140c62f1 100644 --- a/pr/src/md/windows/Makefile +++ b/pr/src/md/windows/Makefile @@ -92,7 +92,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/md/windows/Makefile.in b/pr/src/md/windows/Makefile.in index 210f9a81..c569a168 100644 --- a/pr/src/md/windows/Makefile.in +++ b/pr/src/md/windows/Makefile.in @@ -101,7 +101,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/memory/Makefile b/pr/src/memory/Makefile index 9e494289..807b582c 100644 --- a/pr/src/memory/Makefile +++ b/pr/src/memory/Makefile @@ -52,7 +52,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/memory/Makefile.in b/pr/src/memory/Makefile.in index 84794ccb..0133f368 100644 --- a/pr/src/memory/Makefile.in +++ b/pr/src/memory/Makefile.in @@ -59,7 +59,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/misc/Makefile b/pr/src/misc/Makefile index eba01111..567b14cf 100644 --- a/pr/src/misc/Makefile +++ b/pr/src/misc/Makefile @@ -76,7 +76,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/misc/Makefile.in b/pr/src/misc/Makefile.in index a7bacc98..0ec66850 100644 --- a/pr/src/misc/Makefile.in +++ b/pr/src/misc/Makefile.in @@ -83,7 +83,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/pthreads/Makefile b/pr/src/pthreads/Makefile index 6ae2c4f5..cb99d94d 100644 --- a/pr/src/pthreads/Makefile +++ b/pr/src/pthreads/Makefile @@ -53,7 +53,7 @@ CSRCS = \ TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/pthreads/Makefile.in b/pr/src/pthreads/Makefile.in index 3f2ab371..c18b3c04 100644 --- a/pr/src/pthreads/Makefile.in +++ b/pr/src/pthreads/Makefile.in @@ -59,7 +59,7 @@ CSRCS = \ TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/threads/Makefile b/pr/src/threads/Makefile index 53d677e4..f495470c 100644 --- a/pr/src/threads/Makefile +++ b/pr/src/threads/Makefile @@ -83,7 +83,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/threads/Makefile.in b/pr/src/threads/Makefile.in index 49779f42..69a4b76b 100644 --- a/pr/src/threads/Makefile.in +++ b/pr/src/threads/Makefile.in @@ -89,7 +89,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/threads/combined/Makefile b/pr/src/threads/combined/Makefile index 3ce0e685..98d6020f 100644 --- a/pr/src/threads/combined/Makefile +++ b/pr/src/threads/combined/Makefile @@ -59,7 +59,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/src/threads/combined/Makefile.in b/pr/src/threads/combined/Makefile.in index 534c0e47..043350cc 100644 --- a/pr/src/threads/combined/Makefile.in +++ b/pr/src/threads/combined/Makefile.in @@ -67,7 +67,7 @@ endif TARGETS = $(OBJS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ diff --git a/pr/tests/Makefile b/pr/tests/Makefile index f1a1b758..c544bb65 100644 --- a/pr/tests/Makefile +++ b/pr/tests/Makefile @@ -220,26 +220,26 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) -INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private +INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPLC = -lplc$(MOD_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC= $(libdir)/plc$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX) else - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) endif ifdef PROFILE LDOPTS += -PROFILE -MAP @@ -250,8 +250,8 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC = $(libdir)/plc$(MOD_VERSION).lib else ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF) LDOPTS = -Zlinker /PM:VIO @@ -264,11 +264,11 @@ ifneq ($(OS_ARCH), WINNT) # or -rpath linker option or the LD_RUN_PATH environment variable). ifeq (,$(patsubst /%,,$(DIST))) # $(DIST) is already an absolute pathname. -ABSOLUTE_LIB_DIR = $(DIST)/lib +ABSOLUTE_LIB_DIR = $(libdir) else # $(DIST) is a relative pathname: prepend the current directory. PWD = $(shell pwd) -ABSOLUTE_LIB_DIR = $(PWD)/$(DIST)/lib +ABSOLUTE_LIB_DIR = $(PWD)/$(libdir) endif endif @@ -300,8 +300,8 @@ ifeq ($(OS_ARCH), OSF1) # I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so # we do static linking. ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE))) - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a - LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a + LIBPR = $(libdir)/libnspr$(MOD_VERSION).a + LIBPLC = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lc_r else LDOPTS += -rpath $(ABSOLUTE_LIB_DIR) @@ -389,8 +389,8 @@ ifeq ($(OS_ARCH), NEWS-OS) # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. #export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a - LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a + LIBPR = $(libdir)/libnspr$(MOD_VERSION).a + LIBPLC = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv endif @@ -489,7 +489,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index f310efcf..41bb1808 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -222,11 +222,11 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) -INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private +INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(MOD_VERSION) LIBPLC = -lplc$(MOD_VERSION) @@ -234,16 +234,16 @@ ifndef USE_AUTOCONF ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC= $(libdir)/plc$(MOD_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX) else - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) endif ifdef PROFILE LDOPTS += -PROFILE -MAP @@ -254,8 +254,8 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(libdir)/nspr$(MOD_VERSION).lib + LIBPLC = $(libdir)/plc$(MOD_VERSION).lib else ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF) LDOPTS = -Zlinker /PM:VIO @@ -268,11 +268,11 @@ ifneq ($(OS_ARCH), WINNT) # or -rpath linker option or the LD_RUN_PATH environment variable). ifeq (,$(patsubst /%,,$(DIST))) # $(DIST) is already an absolute pathname. -ABSOLUTE_LIB_DIR = $(DIST)/lib +ABSOLUTE_LIB_DIR = $(libdir) else # $(DIST) is a relative pathname: prepend the current directory. PWD = $(shell pwd) -ABSOLUTE_LIB_DIR = $(PWD)/$(DIST)/lib +ABSOLUTE_LIB_DIR = $(PWD)/$(libdir) endif endif @@ -304,8 +304,8 @@ ifeq ($(OS_ARCH), OSF1) # I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so # we do static linking. ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE))) - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a - LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a + LIBPR = $(libdir)/libnspr$(MOD_VERSION).a + LIBPLC = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lc_r else LDOPTS += -rpath $(ABSOLUTE_LIB_DIR) @@ -393,8 +393,8 @@ ifeq ($(OS_ARCH), NEWS-OS) # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. #export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a - LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a + LIBPR = $(libdir)/libnspr$(MOD_VERSION).a + LIBPLC = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv endif @@ -513,7 +513,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/pr/tests/dll/Makefile b/pr/tests/dll/Makefile index 3d2c3581..820a5516 100644 --- a/pr/tests/dll/Makefile +++ b/pr/tests/dll/Makefile @@ -46,7 +46,7 @@ endif CSRCS = mygetval.c mysetval.c -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) OBJS = $(OBJDIR)/mygetval.$(OBJ_SUFFIX) \ $(OBJDIR)/mysetval.$(OBJ_SUFFIX) diff --git a/pr/tests/dll/Makefile.in b/pr/tests/dll/Makefile.in index deb3b70a..671a9449 100644 --- a/pr/tests/dll/Makefile.in +++ b/pr/tests/dll/Makefile.in @@ -51,7 +51,7 @@ endif CSRCS = mygetval.c mysetval.c -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) OBJS = $(OBJDIR)/mygetval.$(OBJ_SUFFIX) \ $(OBJDIR)/mysetval.$(OBJ_SUFFIX) diff --git a/pr/tests/w16gui/Makefile b/pr/tests/w16gui/Makefile index 72fd09d9..306eb3c4 100644 --- a/pr/tests/w16gui/Makefile +++ b/pr/tests/w16gui/Makefile @@ -48,9 +48,9 @@ CSRCS = poppad.c \ popprnt0.c -INCLUDES = -I$(DIST)/include -LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib -LIBPLDS = $(DIST)/lib/plds$(MOD_VERSION).lib +INCLUDES = -I$(includedir) +LIBPR = $(libdir)/nspr$(MOD_VERSION).lib +LIBPLDS = $(libdir)/plds$(MOD_VERSION).lib TARGETS = $(OBJDIR)/poppad.exe OS_CFLAGS = $(OS_EXE_CFLAGS) diff --git a/pr/tests/w16gui/Makefile.in b/pr/tests/w16gui/Makefile.in index 85fd7731..ba9f572d 100644 --- a/pr/tests/w16gui/Makefile.in +++ b/pr/tests/w16gui/Makefile.in @@ -53,9 +53,9 @@ CSRCS = poppad.c \ popprnt0.c -INCLUDES = -I$(DIST)/include -LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib -LIBPLDS = $(DIST)/lib/plds$(MOD_VERSION).lib +INCLUDES = -I$(includedir) +LIBPR = $(libdir)/nspr$(MOD_VERSION).lib +LIBPLDS = $(libdir)/plds$(MOD_VERSION).lib TARGETS = $(OBJDIR)/poppad.exe OS_CFLAGS = $(OS_EXE_CFLAGS) diff --git a/tools/Makefile b/tools/Makefile index 09dba4b1..f036a4cb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -59,32 +59,32 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) NSPR_VERSION = 3 # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(NSPR_VERSION) LIBPLC = -lplc$(NSPR_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) -LIBPLC= $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX) +LIBPR = $(libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) +LIBPLC= $(libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX) endif endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -95,20 +95,20 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread +LDOPTS += -rpath $(PWD)/$(libdir) -lpthread endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib LIBPR = -lnspr$(NSPR_VERSION)_shr LIBPLC = -lplc$(NSPR_VERSION)_shr endif @@ -117,9 +117,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -143,8 +143,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a -LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a +LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a +LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -154,7 +154,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), SCOOS) @@ -164,7 +164,7 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -197,7 +197,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(NSPR_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(NSPR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) diff --git a/tools/Makefile.in b/tools/Makefile.in index d9bc3d61..7a9ffd54 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -64,32 +64,32 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(includedir) NSPR_VERSION = 3 # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(DIST)/lib +LDOPTS = -L$(libdir) LIBPR = -lnspr$(NSPR_VERSION) LIBPLC = -lplc$(NSPR_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) -LIBPLC= $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX) +LIBPR = $(libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) +LIBPLC= $(libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX) endif endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib - LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib + LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib + LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -100,20 +100,20 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread +LDOPTS += -rpath $(PWD)/$(libdir) -lpthread endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib +LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib +LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib LIBPR = -lnspr$(NSPR_VERSION)_shr LIBPLC = -lplc$(NSPR_VERSION)_shr endif @@ -122,9 +122,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) else -LDOPTS += -R $(PWD)/$(DIST)/lib +LDOPTS += -R $(PWD)/$(libdir) endif endif @@ -148,8 +148,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a -LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a +LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a +LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -159,7 +159,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(libdir) endif ifeq ($(OS_ARCH), SCOOS) @@ -169,7 +169,7 @@ EXTRA_LIBS = -lsocket # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(libdir) endif ##################################################### @@ -202,7 +202,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(NSPR_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(NSPR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) |