aboutsummaryrefslogtreecommitdiff
path: root/trunk/mkbuild/generic.mkSlackBuild
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-09-03 23:56:27 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-09-03 23:56:27 +0000
commit02c35be015c168aa9ad36cb328b29f23b38dd437 (patch)
tree273d47baeaffdae525b238935d1241822416fd33 /trunk/mkbuild/generic.mkSlackBuild
parentcb96b77a89846024572c1b7503c102fee573f458 (diff)
downloadsimplepkg-02c35be015c168aa9ad36cb328b29f23b38dd437.tar.gz
simplepkg-02c35be015c168aa9ad36cb328b29f23b38dd437.tar.bz2
merging with changes made since 21th May
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@514 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/mkbuild/generic.mkSlackBuild')
-rw-r--r--trunk/mkbuild/generic.mkSlackBuild18
1 files changed, 18 insertions, 0 deletions
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 133c851..67776ea 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -305,6 +305,21 @@ mkdir -p $PKG/etc/rc.d
cp $CWD/rc.* $PKG/etc/rc.d/
</copy_init_scripts>
+<copy_config_files> off
+# Copy config files
+mkdir -p $PKG/etc
+for conf in [[CONFIG FILES]]; do
+ mkdir -p $PKG/etc/`dirname $conf`
+ if [ -e "$CWD/conf/$conf" ]; then
+ cp -a $CWD/conf/$conf $PKG/etc/$conf
+ elif [ -e "$CWD/$conf" ]; then
+ cp -a $CWD/$conf $PKG/etc/$conf
+ elif [ -e "$conf" ]; then
+ cp -a $conf $PKG/etc/$conf
+ fi
+done
+</copy_config_files>
+
<install_documentation> off
# Install documentation
DOCS="[[DOCUMENTATION FILES]]"
@@ -345,6 +360,9 @@ cat << EOSCRIPT > "$PKG/install/doinst.sh"
config() {
NEW="\$1"
OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+ OLD="\$(dirname \$NEW)/\$(basename \$OLD .sample)"
+ OLD="\$(dirname \$NEW)/\$(basename \$OLD .dist)"
+
# If there's no config file by that name, mv it over:
if [ ! -r \$OLD ]; then
mv \$NEW \$OLD