diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-05-09 13:21:22 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-05-09 13:21:22 (EDT) |
| commit | 6a0aca87fdbfee437a189ec9c79b967d1b636cd3 (patch) | |
| tree | 5046dca6d7b14e11a88f78ca04ad6c489046690b | |
| parent | 06c0c9b068bbc94eb82dc317ffc811d1c58d3e38 (diff) | |
Add pkgdatadir and archtabdir build system vars.
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | configure | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 3c9f2f7..9c9db68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,12 +32,13 @@ datadir = @datadir@ mandir = @mandir@ man1dir = @man1dir@ localedir = @localedir@ +pkgdatadir = @pkgdatadir@ +archtabdir = @archtabdir@ libopkbuild_1 = @libopkbuild_1@ DESTDIR = / sh = @sh@ -archtab = @archtab@ pkglibbuildsystemdir = $(pkglibdir)/buildsystem @@ -74,6 +75,7 @@ distfiles = \ $(locale_srcs) # FIXME: libopkhelper is deprecated. Migrate code and remove this variable. +# FIXME: archtab is deprecated. Migrate code and remove this variable. script = \ s&@@PACKAGE_NAME@@&$(package_name)&;\ s&@@PACKAGE_VERSION@@&$(package_version)&;\ @@ -81,6 +83,8 @@ script = \ s&@@PKGLIBDIR@@&$(pkglibdir)&;\ s&@@LIBOPKHELPER@@&$(libopkhelper)&;\ s&@@LOCALEDIR@@&$(localedir)&;\ + s&@@ARCHTABDIR@@&$(archtabdir)&;\ + s&@@ARCHTAB@@&$(archtabdir)&;\ s&@@SH@@&$(sh)&; .SUFFIXES: @@ -35,6 +35,8 @@ datadir='${prefix}/share' mandir='${datadir}/man' man1dir='${mandir}/man1' localedir='${datadir}/locale' +pkgdatadir='${datadir}/${package_name}' +archtabdir='${pkgdatadir}/archtab' multiarch_libdir='false' quiet='false' @@ -45,7 +47,6 @@ make ' dep_libs=' libopkbuild.1 -archtab ' long_opts_with_args=' @@ -58,6 +59,8 @@ datadir mandir man1dir localedir +pkgdatadir +archtabdir ' features=" @@ -169,6 +172,10 @@ Installation directories: default: MANDIR/man1 --localedir=LOCALEDIR install locales in LOCALEDIR default: DATADIR/locale + --pkgdatadir=PKGDATADIR install package data in PKGDATADIR + default: DATADIR/${package_name} + --archtabdir=ARCHTABDIR install architecture table entries in ARCHTABDIR + default: PKGDATADIR/archtab Features: --with-multiarch-libdir=BOOL |