diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-03-03 17:06:52 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-03-03 17:06:52 +0000 |
| commit | 2e45bc1c433956a4cd7c7697add184811d1aa6a6 (patch) | |
| tree | 323f3115c85a5e416dbef6f6c29982479ac09fc1 /rules/cvs.make | |
| parent | b0dc86801752549ea3d5771e990abdd0aae2bc34 (diff) | |
| download | ptxdist-2e45bc1c433956a4cd7c7697add184811d1aa6a6.tar.gz ptxdist-2e45bc1c433956a4cd7c7697add184811d1aa6a6.tar.xz | |
[cvs] fix stand alone vs. inetd
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9923 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/cvs.make')
| -rw-r--r-- | rules/cvs.make | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/rules/cvs.make b/rules/cvs.make index 25a594d3f..37e6c0f04 100644 --- a/rules/cvs.make +++ b/rules/cvs.make @@ -127,9 +127,9 @@ $(STATEDIR)/cvs.targetinstall: @$(call install_fixup,cvs,DEPENDS,) @$(call install_fixup,cvs,DESCRIPTION,missing) -ifdef PTXCONF_CVS_INETD_SERVER - @$(call install_alternative, cvs, 0, 0, 0755, /etc/inetd.conf.d/cvs, n) -ifneq ($(PTXCONF_CVS_SERVER_REPOSITORY),"") +ifdef PTXCONF_CVS_INETD + @$(call install_alternative, cvs, 0, 0, 0644, /etc/inetd.conf.d/cvs, n) +ifneq ($(call remove_quotes, $(PTXCONF_CVS_SERVER_REPOSITORY),) # # add info about repository's root @$(call install_replace, cvs, /etc/inetd.conf.d/cvs, \ @ROOT@, \ @@ -139,8 +139,15 @@ else @$(call install_replace, cvs, /etc/inetd.conf.d/cvs, \ @ROOT@, ) endif +endif -ifneq ($(call remove_quotes,$(PTXCONF_CVS_SERVER_REPOSITORY)),) +ifdef PTXCONF_INITMETHOD_BBINIT +ifdef PTXCONF_CVS_STARTSCRIPT + @$(call install_alternative, cvs, 0, 0, 0755, /etc/init.d/cvs, n) +endif +endif + +ifneq ($(call remove_quotes, $(PTXCONF_CVS_SERVER_REPOSITORY)),) @$(call install_copy, cvs, 0, 0, 0755, $(PTXCONF_CVS_SERVER_REPOSITORY)) # # @@ -166,7 +173,6 @@ ifdef PTXCONF_CVS_SERVER_POPULATE_CVSROOT done; endif endif -endif @$(call install_copy, cvs, 0, 0, 0755, $(CVS_DIR)/src/cvs, /usr/bin/cvs) |