openwrt/package/ser/patches/210-runtime_paths.patch

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