1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## ns.mak.in.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Debian specific path used in ns.mak.in
@DPATCH@
diff -urNad aolserver4~/include/ns.mak.in aolserver4/include/ns.mak.in
--- aolserver4~/include/ns.mak.in 2009-02-28 10:31:15.000000000 +0100
+++ aolserver4/include/ns.mak.in 2009-02-28 10:36:48.000000000 +0100
@@ -71,17 +71,19 @@
INSTSRVPAG = $(INSTSRV)/pages
SH = /bin/sh
+DEBRPATH = -Wl,-rpath,$(INSTLIB)
+
#
# Compiler and linker options.
#
LIBEXT = @TCL_SHLIB_SUFFIX@
LDLIB = @LDLIB@
-LDSO = @LDSO@
+LDSO = @LDSO@ $(DEBRPATH)
CCRFLAG = @CCRFLAG@
LDRFLAG = @LDRFLAG@
-CCRPATH += @CCRPATH@
-LDRPATH += @LDRPATH@
+CCRPATH += @CCRPATH@ $(DEBRPATH)
+LDRPATH += @LDRPATH@ $(DEBRPATH)
CC = $(PURIFY) @TCL_CC@
CFLAGS_DEBUG = @TCL_CFLAGS_DEBUG@
CFLAGS_OPTIMIZE = @TCL_CFLAGS_OPTIMIZE@
@@ -91,9 +93,9 @@
DEFS = -DNO_CONST @TCL_DEFS@ @DEFS@
CFLAGS += @CFLAGS_DEFAULT@ $(CFLAGS_WARNING) $(CFLAGS_EXTRA) $(CFLAGS_INCLUDE) @CPPFLAGS@ $(DEFS)
ifndef SRCDIR
- UTILS = $(AOLSERVER)/bin
- LIBS += -L$(AOLSERVER)/lib -lnsd -lnsthread
- INCDIR = $(AOLSERVER)/include
+ UTILS = /usr/share/aolserver4
+ LIBS += -L/usr/lib/aolserver4/lib -lnsd -lnsthread
+ INCDIR = /usr/include/aolserver4
else
UTILS = $(SRCDIR)/util
INCDIR = $(SRCDIR)/include
@@ -198,7 +200,7 @@
$(DLLBIN): $(OBJS) $(LIBOBJ)
$(RM) $(DLLBIN)
$(LDLIB) $(LDFLAGS) -o $(DLLBIN) $(OBJS) $(LIBOBJ) \
- $(DLLLIBS) $(LIBS) @LDRPATHS@
+ $(DLLLIBS) $(LIBS) @LDRPATHS@ $(DEBRPATH)
$(DLLLIB): $(OBJS)
$(AR) rv $(DLLLIB) $(OBJS)
@@ -206,7 +208,7 @@
$(MODBIN): $(MODOBJS) $(DLLBIN)
$(RM) $(MODBIN)
- $(LDSO) $(LDFLAGS) -o $(MODBIN) $(MODOBJS) $(MODLIBS) $(LIBS) @LDRPATHS@
+ $(LDSO) $(LDFLAGS) -o $(MODBIN) $(MODOBJS) $(MODLIBS) $(LIBS) @LDRPATHS@ $(DEBRPATH)
$(MODOBJ): $(MODSRC)
$(CC) $(CFLAGS) -DNS_MODINIT=$(MODINIT) -c -o $(MODOBJ) $(MODSRC)
@@ -217,7 +219,7 @@
$(PGM): $(PGMOBJS) $(DLLLIB) $(DLLBIN)
$(RM) $(PGM)
$(CC) $(LDFLAGS) -o $(PGM) $(PGMOBJS) \
- $(PGMLIBS) $(CCLIBS) @CCRPATHS@
+ $(PGMLIBS) $(CCLIBS) @CCRPATHS@ $(DEBRPATH)
$(MODOBJS) $(OBJS) $(PGMOBJS): $(HDRS) $(INCDIR)/ns.h $(INCDIR)/nsthread.h
|