summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild12
-rw-r--r--opkhelper-1.0-doc.pkg/control (renamed from opkhelper-doc.pkg/control)2
-rw-r--r--opkhelper-1.0-doc.pkg/install (renamed from opkhelper-doc.pkg/install)0
-rw-r--r--opkhelper-1.0.pkg/control (renamed from opkhelper.pkg/control)2
-rw-r--r--opkhelper-1.0.pkg/install2
-rw-r--r--opkhelper.pkg/install2
-rw-r--r--patches/01_fix-build-system.patch46
7 files changed, 59 insertions, 7 deletions
diff --git a/build b/build
index 22c4114..4c1fa84 100755
--- a/build
+++ b/build
@@ -1,16 +1,22 @@
#! /usr/bin/make -f
-PKGS = opkhelper opkhelper-doc
+VER = 1.0
+PKGS = opkhelper-$(VER) opkhelper-$(VER)-doc
$(PKGS): opkhelper.buildstamp
.SILENT: opkhelper.buildstamp
opkhelper.buildstamp:
mkdir build && cd build && \
- ../src/configure --prefix=/usr && \
+ ../src/configure --prefix=/usr --libdir=/usr/share && \
make && make DESTDIR=$$(pwd)/../dest install
+ mv dest/usr/share/opkhelper dest/usr/share/opkhelper-$(VER)
+ for file in dest/usr/bin/* dest/usr/share/man/man*/*; do \
+ basename="$${file##*/}"; \
+ mv "$${file}" "$${file%.*}-$(VER).$${basename##*.}"; \
+ done
oh-installfiles $(PKGS)
- oh-installdocs opkhelper
+ oh-installdocs opkhelper-$(VER)
oh-gencontrol $(PKGS)
oh-buildopk $(PKGS)
touch $@
diff --git a/opkhelper-doc.pkg/control b/opkhelper-1.0-doc.pkg/control
index 695d02b..7b9bdac 100644
--- a/opkhelper-doc.pkg/control
+++ b/opkhelper-1.0-doc.pkg/control
@@ -1,4 +1,4 @@
-Package: opkhelper-doc
+Package: opkhelper-1.0-doc
Architecture: all
Depends: opkg
Description: opkg build helper tools - documentation
diff --git a/opkhelper-doc.pkg/install b/opkhelper-1.0-doc.pkg/install
index 0ddb634..0ddb634 100644
--- a/opkhelper-doc.pkg/install
+++ b/opkhelper-1.0-doc.pkg/install
diff --git a/opkhelper.pkg/control b/opkhelper-1.0.pkg/control
index d237160..a2b0651 100644
--- a/opkhelper.pkg/control
+++ b/opkhelper-1.0.pkg/control
@@ -1,4 +1,4 @@
-Package: opkhelper
+Package: opkhelper-1.0
Architecture: all
Depends: opkg
Description: opkg build helper tools
diff --git a/opkhelper-1.0.pkg/install b/opkhelper-1.0.pkg/install
new file mode 100644
index 0000000..095765d
--- /dev/null
+++ b/opkhelper-1.0.pkg/install
@@ -0,0 +1,2 @@
+/usr/bin
+/usr/share/opkhelper-1.0
diff --git a/opkhelper.pkg/install b/opkhelper.pkg/install
deleted file mode 100644
index b80824e..0000000
--- a/opkhelper.pkg/install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin
-/usr/lib/opkhelper
diff --git a/patches/01_fix-build-system.patch b/patches/01_fix-build-system.patch
new file mode 100644
index 0000000..4e51d8f
--- /dev/null
+++ b/patches/01_fix-build-system.patch
@@ -0,0 +1,46 @@
+Description: Make configure act more like a GNU Autoconf one
+Author: "P. J. McDermott" <pjm@nac.net>
+
+diff -Naur opkhelper-1.0.0.orig/configure opkhelper-1.0.0/configure
+--- opkhelper-1.0.0.orig/configure 2012-04-25 00:43:02.492677186 -0400
++++ opkhelper-1.0.0/configure 2012-06-21 11:52:54.867945276 -0400
+@@ -98,23 +98,19 @@
+ shift 2
+ ;;
+ --bindir)
+- # Leave PREFIX unexpanded for now, in case it isn't set yet.
+- BINDIR="\${PREFIX}/${2}"
++ BINDIR="${2}"
+ shift 2
+ ;;
+ --libdir)
+- # Leave PREFIX unexpanded for now, in case it isn't set yet.
+- LIBDIR="\${PREFIX}/${2}"
++ LIBDIR="${2}"
+ shift 2
+ ;;
+ --datadir)
+- # Leave PREFIX unexpanded for now, in case it isn't set yet.
+- DATADIR="\${PREFIX}/${2}"
++ DATADIR="${2}"
+ shift 2
+ ;;
+ --mandir)
+- # Leave PREFIX unexpanded for now, in case it isn't set yet.
+- MANDIR="\${PREFIX}/${2}"
++ MANDIR="${2}"
+ shift 2
+ ;;
+ --)
+@@ -152,11 +148,6 @@
+ if [ -z "${MANDIR}" ]; then
+ MANDIR=${PREFIX}/share/man
+ fi
+-# Expand PREFIX if it's there.
+-eval "BINDIR=${BINDIR}"
+-eval "LIBDIR=${LIBDIR}"
+-eval "DATADIR=${DATADIR}"
+-eval "MANDIR=${MANDIR}"
+
+ find_dependency()
+ {