You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
101 lines
4.1 KiB
101 lines
4.1 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2009-07-17 23:03:01.000000000 +0200 |
|
+++ Makefile.in 2010-06-15 18:47:15.000000000 +0200 |
|
@@ -46,32 +46,6 @@ |
|
@( cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) |
|
@( cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) |
|
|
|
- @( if [ $(OS) = "Linux" ]; then \ |
|
- if [ ! -d $(dst_dir)/etc/rc.d/init.d ]; then mkdir -p $(dst_dir)/etc/rc.d/init.d; fi ; \ |
|
- fi ) |
|
- @( if [ $(OS) = "Linux" ]; then \ |
|
- if [ ! -f $(dst_dir)/etc/rc.d/init.d/ss5 ]; then cp conf/ss5.init $(dst_dir)/etc/rc.d/init.d/ss5; \ |
|
- else cp conf/ss5.init $(dst_dir)/etc/rc.d/init.d/ss5.rpmnew ; fi ; \ |
|
- fi ) |
|
- @( if [ $(OS) = "Linux" ]; then \ |
|
- if [ ! -d $(dst_dir)/etc/sysconfig ]; then mkdir -p $(dst_dir)/etc/sysconfig; fi ; \ |
|
- fi ) |
|
- @( if [ $(OS) = "Linux" ]; then \ |
|
- if [ ! -f $(dst_dir)/etc/sysconfig/ss5 ]; then cp conf/ss5.sysconfig $(dst_dir)/etc/sysconfig/ss5; \ |
|
- else cp conf/ss5.sysconfig $(dst_dir)/etc/sysconfig/ss5.rpmnew ; fi ; \ |
|
- fi ) |
|
- @( if [ $(OS) = "SunOS" ]; then \ |
|
- if [ ! -d $(dst_dir)/etc/init.d ]; then mkdir -p $(dst_dir)/etc/init.d; fi ; \ |
|
- fi ) |
|
- @( if [ $(OS) = "SunOS" ]; then \ |
|
- if [ ! -f $(dst_dir)/etc/init.d/ss5 ]; then cp conf/ss5.init $(dst_dir)/etc/init.d/ss5; \ |
|
- else cp conf/ss5.init $(dst_dir)/etc/init.d/ss5.rpmnew ; fi ; \ |
|
- fi ) |
|
- @( if [ $(OS) = "FreeBSD" ]; then \ |
|
- if [ ! -f /usr/local/etc/rc.d/ss5 ]; then cp conf/ss5.init /usr/local/etc/rc.d/ss5; \ |
|
- else cp conf/ss5.init /usr/local/etc/rc.d/ss5.rpmnew ; fi ; \ |
|
- fi ) |
|
- |
|
@( if [ ! -d $(dst_dir)$(doc_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(doc_path_base)/ss5; fi ) |
|
@( cp License $(dst_dir)$(doc_path_base)/ss5 ) |
|
@( cp -r doc/ldap/* $(dst_dir)$(doc_path_base)/ss5 ) |
|
@@ -99,14 +73,6 @@ |
|
@( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; \ |
|
else cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5/ss5.passwd.rpmnew ; fi ) |
|
|
|
- @( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \ |
|
- if [ ! -d $(dst_dir)/etc/pam.d ]; then mkdir -p $(dst_dir)/etc/pam.d; fi ; \ |
|
- fi ) |
|
- @( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \ |
|
- if [ ! -f $(dst_dir)/etc/pam.d/ss5 ]; then cp doc/pam/examples/ss5.pam $(dst_dir)/etc/pam.d/ss5; \ |
|
- else cp doc/pam/examples/ss5.pam $(dst_dir)/etc/pam.d/ss5.rpmnew ; fi ; \ |
|
- fi ) |
|
- |
|
@( if [ ! -d $(dst_dir)/var/run/ss5 ]; then mkdir -p $(dst_dir)/var/run/ss5; fi ) |
|
|
|
|
|
Index: build/mod_top.mk |
|
--- build/mod_top.mk.orig 2009-07-11 10:29:22.000000000 +0200 |
|
+++ build/mod_top.mk 2010-06-15 18:46:23.000000000 +0200 |
|
@@ -24,8 +24,8 @@ |
|
top_srcdir=@top_srcdir@ |
|
top_builddir=@top_builddir@ |
|
|
|
-CFLAGS=@CFLAGS@ -I . -I $(top_srcdir)/include -shared -fPIC @EXTRA_CFLAGS@ |
|
+CFLAGS=@CFLAGS@ @CPPFLAGS@ -I . -I $(top_srcdir)/include -shared -fPIC @EXTRA_CFLAGS@ |
|
|
|
-LIBS = -lpthread |
|
+LIBS = @LDFLAGS@ @LIBS@ -lpthread |
|
|
|
CC = @CC@ |
|
Index: configure |
|
--- configure.orig 2009-07-17 23:03:06.000000000 +0200 |
|
+++ configure 2010-06-15 18:46:23.000000000 +0200 |
|
@@ -6423,15 +6423,15 @@ |
|
# Checks for OS |
|
if test "$OS" = "Linux"; then |
|
CFLAGS="$CFLAGS -DLINUX -D_FILE_OFFSET_BITS=64" |
|
- LIBS="-rdynamic -ldl -lssl -lldap -lpam -lpam_misc" |
|
+ LIBS="$LIBS -rdynamic -ldl -lssl -lldap -lpam -lpam_misc" |
|
fi; |
|
if test "$OS" = "SunOS"; then |
|
- CFLAGS="$CFLAGS -DSOLARIS -fPIC -O2 -L/usr/local/lib -R/usr/local/lib" |
|
- LIBS="-lsocket -lnsl -lssl -ldl -lldap -lpam" |
|
+ CFLAGS="$CFLAGS -DSOLARIS -fPIC -O2" |
|
+ LIBS="$LIBS -lsocket -lnsl -lssl -ldl -lldap -lpam" |
|
fi; |
|
if test "$OS" = "FreeBSD"; then |
|
- CFLAGS="$CFLAGS -DFREEBSD -pthread -export-dynamic -I/usr/local/include" |
|
- LIBS="-lpam -lldap -lc -L /usr/local/lib" |
|
+ CFLAGS="$CFLAGS -DFREEBSD -pthread -export-dynamic" |
|
+ LIBS="$LIBS -lpam -lldap -lc -L /usr/local/lib" |
|
CPP="g++" |
|
fi; |
|
|
|
Index: src/Makefile.in |
|
--- src/Makefile.in.orig 2009-07-16 12:24:33.000000000 +0200 |
|
+++ src/Makefile.in 2010-06-15 18:46:23.000000000 +0200 |
|
@@ -22,7 +22,7 @@ |
|
CFLAGS=@CFLAGS@ -I . -I ../include @EXTRA_CFLAGS@ |
|
SRVCFLAGS=@CFLAGS@ -I . -I ../include @EXTRA_CFLAGS@ |
|
|
|
-LIBS = -lpthread @LIBS@ @EXTRA_LIBS@ |
|
+LIBS = @LDFLAGS@ -lpthread @LIBS@ @EXTRA_LIBS@ |
|
|
|
CC = gcc |
|
|
|
|