diff options
author | P. J. McDermott <pjm@nac.net> | 2012-06-21 12:02:30 (EDT) |
---|---|---|
committer | P. J. McDermott <pjm@nac.net> | 2012-06-21 12:04:51 (EDT) |
commit | c71fa7900f033f9a75fd501d822b4a14d52e8d5c (patch) | |
tree | 89a06544791e049bf5c99986154e30994cc03567 /patches | |
parent | e3cb13e367e82194802e4b89ea86dc6981012ce8 (diff) |
Version packages, set libdir, fix build system.
What was upstream thinking when writing configure?
Diffstat (limited to 'patches')
-rw-r--r-- | patches/01_fix-build-system.patch | 46 |
1 files changed, 46 insertions, 0 deletions
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() + { |