summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2007-03-16 23:06:58 +0000
committerRich Megginson <rmeggins@redhat.com>2007-03-16 23:06:58 +0000
commit0d974b1de16450e987ea047d176ec49a5a691288 (patch)
tree9dbab4da44dcd0bbe344020645bc7d11f137dcff /Makefile.am
parentf21aa3dea521bcf6b48d0af1a0b480978623aa68 (diff)
downloadds-0d974b1de16450e987ea047d176ec49a5a691288.tar.gz
ds-0d974b1de16450e987ea047d176ec49a5a691288.tar.xz
ds-0d974b1de16450e987ea047d176ec49a5a691288.zip
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index a63fe88c..a18ccddb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -981,7 +981,9 @@ fixupcmd = sed \
-e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@localstatedir\@,$(localstatedir),g' \
-e 's,@package_name\@,$(PACKAGE_NAME),g' \
- -e 's,@instconfigdir\@,$(instconfigdir),g'
+ -e 's,@instconfigdir\@,$(instconfigdir),g' \
+ -e 's,@ECHO_N\@,$(ECHO_N),g' \
+ -e 's,@ECHO_C\@,$(ECHO_C),g'
else
fixupcmd = sed \
-e 's,@bindir\@,$(bindir),g' \
@@ -1005,7 +1007,9 @@ fixupcmd = sed \
-e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@localstatedir\@,$(localstatedir),g' \
-e 's,@package_name\@,$(PACKAGE_NAME),g' \
- -e 's,@instconfigdir\@,$(instconfigdir),g'
+ -e 's,@instconfigdir\@,$(instconfigdir),g' \
+ -e 's,@ECHO_N\@,$(ECHO_N),g' \
+ -e 's,@ECHO_C\@,$(ECHO_C),g'
endif
%: %.in