summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-11-05 23:58:12 -0500
committerJoey Hess <joey@kodama.kitenet.net>2007-11-05 23:58:12 -0500
commitad7202a18498d46420aefba9b0746ea187dd0472 (patch)
tree03c4a926be3170237973fd1bf21a68c4502f93e4
parent9b4d973cc3bb5ddee00b1c20ef5f1edec8f9ac3a (diff)
stop symlink farming
-rw-r--r--Makefile12
-rw-r--r--README9
-rwxr-xr-xdebian/rules2
3 files changed, 7 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 0f7007b..30a60b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,6 @@
install:
- mkdir -p $(PREFIX)/usr/lib/etckeeper/
- cp -a *.d $(PREFIX)/usr/lib/etckeeper/
-
+ mkdir -p $(PREFIX)/etc/etckeeper/
+ cp -a *.d $(PREFIX)/etc/etckeeper/
install -D etckeeper $(PREFIX)/usr/bin/etckeeper
install -m 0644 -D apt.conf $(PREFIX)/etc/apt/apt.conf.d/05etckeeper
install -m 0644 -D etckeeper.1 $(PREFIX)/usr/share/man/man1/etckeeper.1
-
- for dir in *.d; do \
- mkdir -p $(PREFIX)/etc/etckeeper/$$dir; \
- for file in $$dir/*; do \
- ln -sf /usr/lib/etckeeper/$$file $(PREFIX)/etc/etckeeper/$$file; \
- done; \
- done
diff --git a/README b/README
index 08fd16e..7a2268c 100644
--- a/README
+++ b/README
@@ -125,10 +125,9 @@ control, the sky's the limit..
## configuration
etckeeper uses `run-parts` to run the executable files in
-`/etc/etckeeper/$command.d/`. By default these directories contain a bunch
-of symlinks to the actual files; you can remove or reorder the symlinks, or
-add your own custom files. Each individual file is short, simple, and does
-only one action.
+`/etc/etckeeper/$command.d/`. You can modify these files, or add your own
+custom files. Each individual file is short, simple, and does only one
+action.
For example, here's how to configure it to run `git gc` after each apt run,
which will save a lot of disk space:
@@ -142,7 +141,7 @@ which will save a lot of disk space:
Here's how to disable the automatic commits after each apt run, while still
letting it git-add new files and git-rm removed ones:
- rm /etc/etckeeper/post-apt.d/75git-commit
+ chmod -x /etc/etckeeper/post-apt.d/75git-commit
Note that the etckeeper commands are careful to not hardcode anything about
git. If you want to use some other revision control system, that's
diff --git a/debian/rules b/debian/rules
index a759dac..3518ceb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ binary-indep: build
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) PREFIX=debian/etckeeper
+ $(MAKE) install PREFIX=debian/etckeeper
dh_installdocs README
dh_installexamples
dh_installchangelogs