[Fedora-directory-commits] ldapserver Makefile.am, 1.33, 1.34 aclocal.m4, 1.26, 1.27 configure, 1.35, 1.36 missing, 1.20, 1.21 install-sh, 1.20, 1.21 compile, 1.20, 1.21 depcomp, 1.20, 1.21 config.sub, 1.19, 1.20 config.guess, 1.19, 1.20 Makefile.in, 1.38, 1.39

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9059/ldapserver

Modified Files:
	Makefile.am aclocal.m4 configure missing install-sh compile 
	depcomp config.sub config.guess Makefile.in 
Log Message:
Resolves: bug 232684
Description: need initscripts for Solaris
Fix Description: I messed up the linux init script - turns out linux echo doesn't like \c, so I created a echo_n() function which is stolen from configure.  I had to add @ECHO_N@ and @ECHO_C@ to Makefile.am and have them replaced in initscript.in.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.am	16 Mar 2007 21:32:38 -0000	1.33
+++ Makefile.am	16 Mar 2007 23:06:57 -0000	1.34
@@ -981,7 +981,9 @@
 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 	-e 's, at localstatedir\@,$(localstatedir),g' \
 	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-	-e 's, at instconfigdir\@,$(instconfigdir),g'
+	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+	-e 's, at ECHO_N\@,$(ECHO_N),g' \
+	-e 's, at ECHO_C\@,$(ECHO_C),g'
 else
 fixupcmd = sed \
 	-e 's, at bindir\@,$(bindir),g' \
@@ -1005,7 +1007,9 @@
 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 	-e 's, at localstatedir\@,$(localstatedir),g' \
 	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-	-e 's, at instconfigdir\@,$(instconfigdir),g'
+	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+	-e 's, at ECHO_N\@,$(ECHO_N),g' \
+	-e 's, at ECHO_C\@,$(ECHO_C),g'
 endif
 
 %: %.in


















Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.in	16 Mar 2007 21:32:39 -0000	1.38
+++ Makefile.in	16 Mar 2007 23:06:58 -0000	1.39
@@ -1859,7 +1859,9 @@
 @BUNDLE_FALSE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 @BUNDLE_FALSE@	-e 's, at localstatedir\@,$(localstatedir),g' \
 @BUNDLE_FALSE@	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
- at BUNDLE_FALSE@	-e 's, at instconfigdir\@,$(instconfigdir),g'
+ at BUNDLE_FALSE@	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_FALSE@	-e 's, at ECHO_N\@,$(ECHO_N),g' \
+ at BUNDLE_FALSE@	-e 's, at ECHO_C\@,$(ECHO_C),g'
 
 
 # these are for the config files and scripts that we need to generate and replace
@@ -1890,7 +1892,9 @@
 @BUNDLE_TRUE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 @BUNDLE_TRUE@	-e 's, at localstatedir\@,$(localstatedir),g' \
 @BUNDLE_TRUE@	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
- at BUNDLE_TRUE@	-e 's, at instconfigdir\@,$(instconfigdir),g'
+ at BUNDLE_TRUE@	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_TRUE@	-e 's, at ECHO_N\@,$(ECHO_N),g' \
+ at BUNDLE_TRUE@	-e 's, at ECHO_C\@,$(ECHO_C),g'
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am