diff options
| -rw-r--r-- | rules/rsync.in | 38 | ||||
| -rw-r--r-- | rules/rsync.make | 4 |
2 files changed, 20 insertions, 22 deletions
diff --git a/rules/rsync.in b/rules/rsync.in index 6b7dc6f55..578e9eb49 100644 --- a/rules/rsync.in +++ b/rules/rsync.in @@ -39,28 +39,26 @@ comment "runtime options ---" depends on RSYNC choice + prompt "Kind of rsyncd.conf/rsyncd.secrets file" + depends on RSYNC + default RSYNC_CONFIG_FILE_DEFAULT -prompt "Kind of rsyncd.conf/rsyncd.secrets file" -depends on RSYNC -default RSYNC_CONFIG_FILE_DEFAULT - -config RSYNC_CONFIG_FILE_DEFAULT - bool - prompt "Use generic" - help - The files from generic/etc/rsyncd.conf|rsyncd.secrets will be used. - Its a very good idea to start with this default files and save a - customised version into your project, because the generic files are - really useless. You can use your own version if you select - "User defined" here. - -config RSYNC_CONFIG_FILE_USER - bool - prompt "User defined" - help - The files from <project>/projectroot/etc/rsyncd.conf|rsyncd.secrets - will be used. + config RSYNC_CONFIG_FILE_DEFAULT + bool + prompt "Use generic" + help + The files from generic/etc/rsyncd.conf|rsyncd.secrets will be used. + Its a very good idea to start with this default files and save a + customised version into your project, because the generic files are + really useless. You can use your own version if you select + "User defined" here. + config RSYNC_CONFIG_FILE_USER + bool + prompt "User defined" + help + The files from <project>/projectroot/etc/rsyncd.conf|rsyncd.secrets + will be used. endchoice choice diff --git a/rules/rsync.make b/rules/rsync.make index 69c68d4cd..96722ba11 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -141,7 +141,7 @@ ifdef PTXCONF_RSYNC_CONFIG_FILE_DEFAULT ifneq ($(call remove_quotes,$(PTXCONF_RSYNC_CONFIG_FILE)),) @$(call install_copy, rsync, 0, 0, 0644, \ $(PTXDIST_TOPDIR)/generic/etc/rsyncd.conf, \ - $(PTXCONF_RSYNC_CONFIG_FILE), n) + $(call remove_quotes,$(PTXCONF_RSYNC_CONFIG_FILE)), n ) else # use default @$(call install_copy, rsync, 0, 0, 0644, \ @@ -157,7 +157,7 @@ ifdef PTXCONF_RSYNC_CONFIG_FILE_USER ifneq ($(call remove_quotes,$(PTXCONF_RSYNC_CONFIG_FILE)),) @$(call install_copy, rsync, 0, 0, 0644, \ $(PTXDIST_WORKSPACE)/projectroot/etc/rsyncd.conf, \ - $(PTXCONF_RSYNC_CONFIG_FILE), n) + $(call remove_quotes,$(PTXCONF_RSYNC_CONFIG_FILE)), n ) else # use as default @$(call install_copy, rsync, 0, 0, 0644, \ |