From 9faaca049ddf4724aa5a02b4917717f478cc348a Mon Sep 17 00:00:00 2001 From: Petr Muller <muller@redhat.com> Date: Wed, 25 Jul 2012 17:30:57 +0200 Subject: [PATCH] Revert the configurable default BL installation dir (it broke RPMs building) --- src/Makefile | 2 -- src/beakerlib.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 70f51eb..7a309dd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -60,8 +60,6 @@ install: $(FILES) docsman gendict install -p -m 644 examples/apache/* $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/apache install -p -m 644 $(FILES) $(DESTDIR)/usr/share/beakerlib - sed -i -e 's|INSTALLPATH|$(DESTDIR)|' $(DESTDIR)/usr/share/beakerlib/beakerlib.sh - install -p -m 644 dictionary.vim $(DESTDIR)/usr/share/beakerlib install -p python/rlMemAvg.py $(DESTDIR)/usr/bin/beakerlib-rlMemAvg diff --git a/src/beakerlib.sh b/src/beakerlib.sh index 67e4ae0..4cf7441 100644 --- a/src/beakerlib.sh +++ b/src/beakerlib.sh @@ -273,7 +273,7 @@ fi test -f /etc/profile.d/cobbler.sh && . /etc/profile.d/cobbler.sh set -e -export BEAKERLIB=${BEAKERLIB:-"INSTALLPATH"} +export BEAKERLIB=${BEAKERLIB:-"/usr/share/beakerlib"} . $BEAKERLIB/infrastructure.sh . $BEAKERLIB/journal.sh . $BEAKERLIB/logging.sh -- 1.7.11.2