From 1d04401b0c755adb4691fff2274e9571e64f6d14 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 27 Aug 2012 21:46:52 +0200 Subject: Revert "Merge pull request #91 from gtmanfred/master" This reverts commit ef7d50ac03dc9cedef294b3b75c1b648fa3d007d, reversing changes made to 28d8263093b1fd3ff90dc3a7ab0a184684ea6a34. This edits is faulty, the parameters given to setup.py was correct, this will messes up things if PREFIX is omitted. The error was actually a missed commit. --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2cb14e4..7ac2b50 100755 --- a/configure +++ b/configure @@ -13,10 +13,10 @@ function makeMakefile() echo -e 'default: all\n' echo -e 'all: build\n' for func in $(echo 'build' 'prebuilt' 'uninstall' 'uninstall-old' 'clean' 'clean-old' 'view'); do - echo -e "$func"':\n\t./setup.py --dest-dir="$(DESTDIR)" --prefix="$(PREFIX)" $(PARAMS) '"$func"'\n' + echo -e "$func"':\n\t./setup.py ---DESTDIR="$(DESTDIR)" ---PREFIX="$(PREFIX)" $(PARAMS) '"$func"'\n' done - echo -e 'install-build:\n\t./setup.py --dest-dir="$(DESTDIR)" --prefix="$(PREFIX)" $(PARAMS) install\n' - echo -e 'install:\n\t./setup.py --dest-dir="$(DESTDIR)" --prefix="$(PREFIX)" $(PARAMS) prebuilt\n' + echo -e 'install-build:\n\t./setup.py ---DESTDIR="$(DESTDIR)" ---PREFIX="$(PREFIX)" $(PARAMS) install\n' + echo -e 'install:\n\t./setup.py ---DESTDIR="$(DESTDIR)" ---PREFIX="$(PREFIX)" $(PARAMS) prebuilt\n' } -- cgit