summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Nehls2015-11-19 16:22:05 +0100
committerRobin Nehls2015-11-19 16:22:05 +0100
commit7a396a5cb95cdb266fb21b4e0c37b329382b29d8 (patch)
tree6710308c963d0dacf550d3f9b35efafb3ebb91dc
parent6a13bfeea879b0e00a4a7423696e6294de3d1d1a (diff)
downloadaur-7a396a5cb95cdb266fb21b4e0c37b329382b29d8.tar.gz
fix hardcoded build path
-rw-r--r--0001-PKGBUILD-compat.patch71
-rw-r--r--PKGBUILD14
2 files changed, 77 insertions, 8 deletions
diff --git a/0001-PKGBUILD-compat.patch b/0001-PKGBUILD-compat.patch
new file mode 100644
index 000000000000..cea28d59739c
--- /dev/null
+++ b/0001-PKGBUILD-compat.patch
@@ -0,0 +1,71 @@
+From b64fcf0e8557552aa5c193bb20a6a89975528027 Mon Sep 17 00:00:00 2001
+From: Robin Nehls <nehls@mi.fu-berlin.de>
+Date: Thu, 19 Nov 2015 16:18:42 +0100
+Subject: [PATCH] PKGBUILD compat
+
+---
+ GNUmakefile | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 56647ba..beab352 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -1,4 +1,5 @@
+ PREFIX = /usr/local
++REALPREFIX = /usr/local
+ LIBDIR = lib/imunes
+ IMUNESDIR = $(PREFIX)/$(LIBDIR)
+ CONFIGDIR = $(IMUNESDIR)/config
+@@ -11,6 +12,7 @@ NORMAL_ICONSDIR = $(ICONSDIR)/normal
+ SMALL_ICONSDIR = $(ICONSDIR)/small
+ TINY_ICONSDIR = $(ICONSDIR)/tiny
+ BINDIR = $(PREFIX)/bin
++REALBINDIR = $(REALPREFIX)/bin
+ IMUNESDATE = `date +"%Y%m%d"`
+ IMUNESVER = 1.0
+ TARBALL_DIR = imunes_$(IMUNESDATE)
+@@ -47,19 +49,19 @@ info:
+
+ all: install
+
+-install: uninstall
++install:
+ mkdir -p $(IMUNESDIR)
+ cp $(BASEFILES) $(IMUNESDIR)
+ sh scripts/update_version.sh
+ mkdir -p $(BINDIR)
+
+ sed -e "s,set LIBDIR \"\",set LIBDIR $(LIBDIR)," \
+- -e "s,set ROOTDIR \".\",set ROOTDIR $(PREFIX)," \
++ -e "s,set ROOTDIR \".\",set ROOTDIR $(REALPREFIX)," \
+ imunes.tcl > $(IMUNESDIR)/imunes.tcl
+
+ sed -e "s,LIBDIR=\"\",LIBDIR=$(LIBDIR)," \
+- -e "s,ROOTDIR=\".\",ROOTDIR=$(PREFIX)," \
+- -e "s,BINDIR=\".\",BINDIR=$(BINDIR)," \
++ -e "s,ROOTDIR=\".\",ROOTDIR=$(REALPREFIX)," \
++ -e "s,BINDIR=\".\",BINDIR=$(REALBINDIR)," \
+ imunes > $(BINDIR)/imunes
+ chmod 755 $(BINDIR)/imunes
+
+@@ -80,7 +82,7 @@ endif
+
+ for file in $(VROOT); do \
+ sed -e "s,LIBDIR=\"\",LIBDIR=$(LIBDIR)," \
+- -e "s,ROOTDIR=\".\",ROOTDIR=$(PREFIX)," \
++ -e "s,ROOTDIR=\".\",ROOTDIR=$(REALPREFIX)," \
+ $${file} > $(IMUNESDIR)/$${file}; \
+ chmod 755 $(IMUNESDIR)/$${file}; \
+ done ;
+@@ -149,7 +151,6 @@ endif
+
+ tarball:
+ rm -f ../$(TARBALL_DIR).tar.gz
+-
+ mkdir -p ../$(TARBALL_DIR)
+ cp $(FILES) $(BINARIES) $(VROOT) Makefile imunes imunes.tcl ../$(TARBALL_DIR)
+
+--
+2.6.2
+
diff --git a/PKGBUILD b/PKGBUILD
index f60aa2784c7a..588106e42510 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,10 @@ license=('BSD')
depends=('tk' 'tcllib' 'wireshark-gtk' 'imagemagick' 'docker' 'openvswitch' 'xterm')
makedepends=('make')
provides=('imunes')
-source=('git+https://github.com/imunes/imunes.git')
-sha1sums=('SKIP')
+source=('git+https://github.com/imunes/imunes.git'
+ '0001-PKGBUILD-compat.patch')
+sha1sums=('SKIP'
+ 'ba1dbc566f352e3faeed62bc3561f3f01265c777')
_gitname=imunes
pkgver() {
@@ -22,16 +24,12 @@ pkgver() {
prepare() {
cd $_gitname
sed -i "s,ROOTDIR=\"/usr/local\",ROOTDIR=\"${pkgdir}/usr\"," scripts/update_version.sh
-}
-
-build() {
- echo "No Build"
- echo "${pkgdir}"
+ patch -p1 -i $srcdir/0001-PKGBUILD-compat.patch
}
package() {
cd $_gitname
- make PREFIX=${pkgdir}/usr install
+ make PREFIX=${pkgdir}/usr REALPREFIX=/usr install
}
# vim:set ts=2 sw=2 et: