diff options
| author | Joey Hess <joey@kitenet.net> | 2011-11-25 12:33:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-25 12:33:48 -0400 |
| commit | 3137b75b6b0d86096e66daa24c477d4e71d85d77 (patch) | |
| tree | 1a6184c1625cb6bd95bd98fd65adfc06d2389b52 /Makefile | |
| parent | 618123e77322ea002cde9b80cce269b1960b574d (diff) | |
| parent | 299dc44f1014404ca1367b72e2a22605ef22d127 (diff) | |
Merge branch 'master' into allperms
Conflicts:
debian/changelog
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -36,7 +36,7 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum) $(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py $(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf endif - -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) || echo "** bzr support not installed" + -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" echo "** installation successful" clean: etckeeper.spec |