diff options
| author | Michael Stone <michael@laptop.org> | 2009-02-27 00:02:14 (GMT) |
|---|---|---|
| committer | Michael Stone <michael@laptop.org> | 2009-02-27 00:02:14 (GMT) |
| commit | 133f11f354e7e54acf4c5f1f5be7cd474b015e55 (patch) | |
| tree | 57d2842d7a84a6fde295d2eb434e120fef224d3c | |
| parent | f2105d2d2611af39d22deb9f11dbfcb01224901a (diff) | |
Correctly install rainbow-sugarize into /usr/bin by default.
Thanks to Sascha Silbe for testing.
| -rw-r--r-- | rainbow/Makefile.build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rainbow/Makefile.build b/rainbow/Makefile.build index 2cad956..2f66033 100644 --- a/rainbow/Makefile.build +++ b/rainbow/Makefile.build @@ -1,9 +1,10 @@ export DESTDIR ?= / -export BINDIR ?= $(DESTDIR)/bin -export SBINDIR ?= $(DESTDIR)/sbin +export PREFIX ?= /usr +export BINDIR ?= $(DESTDIR)$(PREFIX)/bin +export SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin export LOCALSTATEDIR ?= $(DESTDIR)/var export SYSCONFDIR ?= $(DESTDIR)/etc -export LIBDIR ?= $(DESTDIR)/lib +export LIBDIR ?= $(DESTDIR)$(PREFIX)/lib # targets build: @@ -13,7 +14,7 @@ build: install: python setup.py install --root=$(DESTDIR) install -D -m 0755 bin/rainbow-run $(BINDIR)/rainbow-run - install -D -m 0755 bin/rainbow-run $(BINDIR)/rainbow-sugarize + install -D -m 0755 bin/rainbow-sugarize $(BINDIR)/rainbow-sugarize install -D -m 0755 bin/mkenvdir $(BINDIR)/mkenvdir install -d $(SYSCONFDIR)/security/console.perms.d/ install -m 0644 rainbow/conf/51-rainbow.perms $(SYSCONFDIR)/security/console.perms.d/51-rainbow.perms |