summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-09-04 22:12:49 (EDT)
committer P. J. McDermott <pjm@nac.net>2012-09-04 22:12:49 (EDT)
commit3a4f616cd7fcbcc18e6cfc4d98d4e595dc682e47 (patch)
tree8202a2d854d9d6170fb0ac71f092ae2bb8b03dac
parentbfaf709d6544fb5b53d7e498ba3f1ccae22e1302 (diff)
Add "libopkbuild" macro to build system.
-rw-r--r--Makefile.in4
-rwxr-xr-xconfigure4
-rw-r--r--lib/Makefile.in5
-rw-r--r--src/Makefile.in3
4 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 4b643b0..6a60981 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ bindir = @bindir@
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
+libopkbuild = @libopkbuild@
DESTDIR = /
@@ -37,7 +38,8 @@ MACROS = \
'bindir=$(bindir)' \
'libdir=$(libdir)' \
'datadir=$(datadir)' \
- 'mandir=$(mandir)'
+ 'mandir=$(mandir)' \
+ 'libopkbuild=$(libopkbuild)'
distdir = $(package_name)-$(package_version)
distfiles = configure Makefile.in COPYING README INSTALL ChangeLog TODO \
diff --git a/configure b/configure
index e850771..c943275 100755
--- a/configure
+++ b/configure
@@ -27,10 +27,11 @@ srcdir=$(dirname "${0}")
srcdir=$(cd ${srcdir} && pwd)
prefix='/usr/local'
bindir='$(prefix)/bin'
-libdir='$(prefix)/lib/opkhelper'
+libdir='$(prefix)/lib'
datadir='$(prefix)/share'
mandir='$(datadir)/man'
localedir='$(datadir)/locale'
+libopkbuild='$(libdir)/libopkbuild.1'
quiet=false
missing_deps=false
@@ -55,6 +56,7 @@ subst_vars="package_name
package_version
package_description
${long_opts_with_args}
+libopkbuild
${dep_cmds}"
main()
diff --git a/lib/Makefile.in b/lib/Makefile.in
index d0269c0..8251853 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -25,11 +25,12 @@ prefix = @prefix@
libdir = @libdir@
datadir = @datadir@
localedir = @localedir@
+libopkbuild = @libopkbuild@
sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
s&@@PACKAGE_VERSION@@&$(package_version)&;\
- s&@@LIBDIR@@&$(libdir)&;\
- s&@@LOCALEDIR@@&$(localedir)&;
+ s&@@LOCALEDIR@@&$(localedir)&;\
+ s&@@LIBOPKBUILD@@&$(libopkbuild)&;
.SUFFIXES:
.SUFFIXES: .sh
diff --git a/src/Makefile.in b/src/Makefile.in
index fc3e0c0..7e08291 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -24,12 +24,13 @@ srcdir = @srcdir@
prefix = @prefix@
bindir = @bindir@
libdir = @libdir@
+libopkbuild = @libopkbuild@
sh = @sh@
sed_script = s&@@PACKAGE_NAME@@&$(package_name)&;\
s&@@PACKAGE_VERSION@@&$(package_version)&;\
- s&@@LIBDIR@@&$(libdir)&;\
+ s&@@LIBOPKBUILD@@&$(libopkbuild)&;\
s&@@SH@@&$(sh)&;
.SUFFIXES: