Add autotool substitution for SRCEXT.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
139d3c5e99
commit
e422b71a48
@ -38,6 +38,11 @@ AC_ARG_WITH(pkg-ext,
|
|||||||
AC_HELP_STRING([--with-pkg-ext=ext], [Set the file extension used by packages]),
|
AC_HELP_STRING([--with-pkg-ext=ext], [Set the file extension used by packages]),
|
||||||
[PKGEXT=$withval], [PKGEXT=.pkg.tar.gz])
|
[PKGEXT=$withval], [PKGEXT=.pkg.tar.gz])
|
||||||
|
|
||||||
|
# Help line for source package directory
|
||||||
|
AC_ARG_WITH(src-ext,
|
||||||
|
AC_HELP_STRING([--with-src-ext=ext], [Set the file extension used by source packages]),
|
||||||
|
[SRCEXT=$withval], [SRCEXT=.src.tar.gz])
|
||||||
|
|
||||||
# Help line for database extension
|
# Help line for database extension
|
||||||
AC_ARG_WITH(db-ext,
|
AC_ARG_WITH(db-ext,
|
||||||
AC_HELP_STRING([--with-db-ext=ext], [Set the file extension used by the database]),
|
AC_HELP_STRING([--with-db-ext=ext], [Set the file extension used by the database]),
|
||||||
@ -195,6 +200,9 @@ rectory])
|
|||||||
# Set package file extension
|
# Set package file extension
|
||||||
AC_SUBST(PKGEXT)
|
AC_SUBST(PKGEXT)
|
||||||
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
|
AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packages])
|
||||||
|
# Set source package file extension
|
||||||
|
AC_SUBST(SRCEXT)
|
||||||
|
AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman source packages])
|
||||||
# Set database file extension
|
# Set database file extension
|
||||||
AC_SUBST(DBEXT)
|
AC_SUBST(DBEXT)
|
||||||
AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases])
|
AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases])
|
||||||
@ -243,6 +251,7 @@ $PACKAGE_STRING:
|
|||||||
Directory and file information:
|
Directory and file information:
|
||||||
root working directory : ${ROOTDIR}
|
root working directory : ${ROOTDIR}
|
||||||
package extension : ${PKGEXT}
|
package extension : ${PKGEXT}
|
||||||
|
source pkg extension : ${SRCEXT}
|
||||||
database extension : ${DBEXT}
|
database extension : ${DBEXT}
|
||||||
|
|
||||||
Compilation options:
|
Compilation options:
|
||||||
|
@ -13,6 +13,7 @@ edit = sed \
|
|||||||
-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
|
-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
|
||||||
-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
|
-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
|
||||||
-e 's|@PKGEXT[@]|$(PKGEXT)|g' \
|
-e 's|@PKGEXT[@]|$(PKGEXT)|g' \
|
||||||
|
-e 's|@SRCEXT[@]|$(SRCEXT)|g' \
|
||||||
-e 's|@CARCH[@]|$(CARCH)|g' \
|
-e 's|@CARCH[@]|$(CARCH)|g' \
|
||||||
-e 's|@CHOST[@]|$(CHOST)|g' \
|
-e 's|@CHOST[@]|$(CHOST)|g' \
|
||||||
-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
|
-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \
|
||||||
|
@ -94,6 +94,7 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc})
|
|||||||
#
|
#
|
||||||
BUILDSCRIPT='PKGBUILD'
|
BUILDSCRIPT='PKGBUILD'
|
||||||
PKGEXT='@PKGEXT@'
|
PKGEXT='@PKGEXT@'
|
||||||
|
SRCEXT='@SRCEXT@'
|
||||||
DB_COMPRESSION='gz'
|
DB_COMPRESSION='gz'
|
||||||
DB_CHECKSUMS=(md5)
|
DB_CHECKSUMS=(md5)
|
||||||
|
|
||||||
|
@ -666,7 +666,7 @@ create_srcpackage() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
# TODO make package extension configurable like $PKGEXT
|
# TODO make package extension configurable like $PKGEXT
|
||||||
local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}.src.tar.gz"
|
local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}"
|
||||||
|
|
||||||
# tar it up
|
# tar it up
|
||||||
msg2 "$(gettext "Compressing source package...")"
|
msg2 "$(gettext "Compressing source package...")"
|
||||||
@ -990,7 +990,7 @@ msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel ($date)"
|
|||||||
|
|
||||||
# if we are creating a source-only package, go no further
|
# if we are creating a source-only package, go no further
|
||||||
if [ "$SOURCEONLY" = "1" ]; then
|
if [ "$SOURCEONLY" = "1" ]; then
|
||||||
if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}.src.tar.gz" \
|
if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \
|
||||||
-a "$FORCE" = "0" ]; then
|
-a "$FORCE" = "0" ]; then
|
||||||
error "$(gettext "a package has already been built. (use -f to overwrite)")"
|
error "$(gettext "a package has already been built. (use -f to overwrite)")"
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
Reference in New Issue
Block a user