openwrt/package/ser/patches/runtime-paths.patch

   1 diff -urN ser-0.9.0.old/etc/ser.cfg ser-0.9.0/etc/ser.cfg
   2 --- ser-0.9.0.old/etc/ser.cfg   2004-11-30 17:28:24.000000000 +0100
   3 +++ ser-0.9.0/etc/ser.cfg       2005-03-25 17:23:32.000000000 +0100
   4 @@ -25,20 +25,20 @@
   5  # ------------------ module loading ----------------------------------
   6
   7  # Uncomment this if you want to use SQL database
   8 -#loadmodule "/usr/local/lib/ser/modules/mysql.so"
   9 +#loadmodule "/usr/lib/ser/modules/mysql.so"
  10
  11 -loadmodule "/usr/local/lib/ser/modules/sl.so"
  12 -loadmodule "/usr/local/lib/ser/modules/tm.so"
  13 -loadmodule "/usr/local/lib/ser/modules/rr.so"
  14 -loadmodule "/usr/local/lib/ser/modules/maxfwd.so"
  15 -loadmodule "/usr/local/lib/ser/modules/usrloc.so"
  16 -loadmodule "/usr/local/lib/ser/modules/registrar.so"
  17 -loadmodule "/usr/local/lib/ser/modules/textops.so"
  18 +loadmodule "/usr/lib/ser/modules/sl.so"
  19 +loadmodule "/usr/lib/ser/modules/tm.so"
  20 +loadmodule "/usr/lib/ser/modules/rr.so"
  21 +loadmodule "/usr/lib/ser/modules/maxfwd.so"
  22 +loadmodule "/usr/lib/ser/modules/usrloc.so"
  23 +loadmodule "/usr/lib/ser/modules/registrar.so"
  24 +loadmodule "/usr/lib/ser/modules/textops.so"
  25
  26  # Uncomment this if you want digest authentication
  27  # mysql.so must be loaded !
  28 -#loadmodule "/usr/local/lib/ser/modules/auth.so"
  29 -#loadmodule "/usr/local/lib/ser/modules/auth_db.so"
  30 +#loadmodule "/usr/lib/ser/modules/auth.so"
  31 +#loadmodule "/usr/lib/ser/modules/auth_db.so"
  32
  33  # ----------------- setting module-specific parameters ---------------
  34
  35 diff -urN ser-0.9.0.old/Makefile ser-0.9.0/Makefile
  36 --- ser-0.9.0.old/Makefile      2004-12-08 20:06:12.000000000 +0100
  37 +++ ser-0.9.0/Makefile  2005-03-25 17:21:35.000000000 +0100
  38 @@ -198,8 +198,8 @@
  39  # binary dist. tar.gz
  40  .PHONY: bin
  41  bin:
  42 -       mkdir -p tmp/ser/usr/local
  43 -       $(MAKE) install basedir=tmp/ser prefix=/usr/local
  44 +       mkdir -p tmp/ser/usr
  45 +       $(MAKE) install basedir=tmp/ser prefix=/usr
  46         $(TAR) -C tmp/ser/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz .
  47         rm -rf tmp/ser
  48
  49 @@ -211,9 +211,9 @@
  50  sunpkg:
  51         mkdir -p tmp/ser
  52         mkdir -p tmp/ser_sun_pkg
  53 -       $(MAKE) install basedir=tmp/ser prefix=/usr/local
  54 +       $(MAKE) install basedir=tmp/ser prefix=/usr
  55         (cd solaris; \
  56 -       pkgmk -r ../tmp/ser/usr/local -o -d ../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
  57 +       pkgmk -r ../tmp/ser/usr -o -d ../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
  58         cd ..)
  59         cat /dev/null > ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
  60         pkgtrans -s tmp/ser_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \
  61 diff -urN ser-0.9.0.old/Makefile.defs ser-0.9.0/Makefile.defs
  62 --- ser-0.9.0.old/Makefile.defs 2005-03-25 15:28:58.000000000 +0100
  63 +++ ser-0.9.0/Makefile.defs     2005-03-25 17:26:09.000000000 +0100
  64 @@ -68,15 +68,15 @@
  65  # extra CC command line options (e.g  -march=athlon-mp)
  66  CC_EXTRA_OPTS ?=
  67   # install location
  68 -DESTDIR ?= /usr/local
  69 +DESTDIR ?= /usr
  70  PREFIX ?= $(DESTDIR)
  71 -LOCALBASE ?= /usr/local
  72 +LOCALBASE ?= /usr
  73  prefix = $(PREFIX)
  74  # install path is $(basedir) $(prefix)
  75  # example:
  76 -#  creating a bin. archive in /tmp, which unpacks in /usr/local
  77 +#  creating a bin. archive in /tmp, which unpacks in /usr
  78  #  basedir=/tmp
  79 -#  prefix=/usr/local
  80 +#  prefix=/usr
  81
  82  BASEDIR ?=
  83  basedir = $(BASEDIR)
  84 @@ -121,7 +121,7 @@
  85  endif
  86  ut-prefix = bin/
  87  # target dirs for various stuff
  88 -cfg-target = $(prefix)/$(cfg-dir)
  89 +cfg-target = /$(cfg-dir)
  90  bin-target = $(prefix)/$(bin-dir)
  91  modules-target = $(prefix)/$(modules-dir)
  92  doc-target = $(prefix)/$(doc-dir)
  93 @@ -817,7 +817,7 @@
  94                 #MOD_LDFLAGS=-g -G
  95         endif
  96  ifneq ($(TLS),)
  97 -       DEFS+= -I/usr/local/ssl/include
  98 +       DEFS+= -I/usr/ssl/include
  99  endif
 100         YACC=yacc
 101
 102 @@ -826,7 +826,7 @@
 103  endif
 104         OLD_SOLARIS= $(shell echo "$(OSREL)" | \
 105                                 sed -e 's/^5\.[0-6][^0-9]*$$/yes/' )
 106 -       LIBS+= -L/usr/local/lib -lxnet -lnsl
 107 +       LIBS+= -L/usr/lib -lxnet -lnsl
 108  ifeq   ($(OLD_SOLARIS), yes)
 109                 LIBS+=-lposix4
 110  else
 111 @@ -918,7 +918,7 @@
 112
 113  #add libssl if needed
 114  ifneq ($(TLS),)
 115 -LIBS+= -L/usr/local/lib -L/usr/local/ssl/lib -lssl  -lcrypto
 116 +LIBS+= -L/usr/lib -L/usr/ssl/lib -lssl  -lcrypto
 117  endif
 118
 119  ifneq ($(found_lock_method), yes)