Newer versions of the helper scripts upstream

This commit is contained in:
Pierre Pronchery 2014-01-23 12:42:25 -06:00
parent 88a40ac5bb
commit 0fd8da5e6b
3 changed files with 42 additions and 8 deletions

View File

@ -3,7 +3,7 @@ includedir=${prefix}/include
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
Name: libApp Name: @PACKAGE@
Description: DeforaOS System essential library Description: DeforaOS System essential library
Version: @VERSION@ Version: @VERSION@
Requires: libSystem Requires: libSystem

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2011-2013 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2011-2014 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -26,7 +26,7 @@
#variables #variables
PREFIX="/usr/local" PREFIX="/usr/local"
. "../config.sh" [ -f "../config.sh" ] && . "../config.sh"
DEBUG="_debug" DEBUG="_debug"
DEVNULL="/dev/null" DEVNULL="/dev/null"
#executables #executables
@ -45,6 +45,14 @@ _debug()
} }
#error
_error()
{
echo "pkgconfig.sh: $@" 1>&2
return 2
}
#usage #usage
_usage() _usage()
{ {
@ -85,6 +93,16 @@ if [ $# -eq 0 ]; then
exit $? exit $?
fi fi
#check the variables
if [ -z "$PACKAGE" ]; then
_error "The PACKAGE variable needs to be set"
exit $?
fi
if [ -z "$VERSION" ]; then
_error "The VERSION variable needs to be set"
exit $?
fi
PKGCONFIG="$PREFIX/lib/pkgconfig" PKGCONFIG="$PREFIX/lib/pkgconfig"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
target="$1" target="$1"
@ -118,9 +136,11 @@ while [ $# -gt 0 ]; do
fi fi
#create #create
$DEBUG $SED -e "s;@PREFIX@;$PREFIX;" \ $DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;" \
-e "s;@VERSION@;$VERSION;" \ -e "s;@VERSION@;$VERSION;" \
-e "s;@RPATH@;$RPATH;" -- "$target.in" > "$target" -e "s;@PREFIX@;$PREFIX;" \
-e "s;@RPATH@;$RPATH;" \
-- "$target.in" > "$target"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
$DEBUG $RM -- "$target" $DEBUG $RM -- "$target"
exit 2 exit 2

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2012-2013 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2012-2014 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -26,8 +26,7 @@
#variables #variables
PREFIX="/usr/local" PREFIX="/usr/local"
. "../config.sh" [ -f "../config.sh" ] && . "../config.sh"
MODULE="$PACKAGE"
#executables #executables
DEBUG="_debug" DEBUG="_debug"
GTKDOC_FIXXREF="gtkdoc-fixxref" GTKDOC_FIXXREF="gtkdoc-fixxref"
@ -50,6 +49,14 @@ _debug()
} }
#error
_error()
{
echo "gtkdoc.sh: $@" 1>&2
return 2
}
#usage #usage
_usage() _usage()
{ {
@ -90,6 +97,13 @@ if [ $# -eq 0 ]; then
exit $? exit $?
fi fi
#check the variables
if [ -z "$PACKAGE" ]; then
_error "The PACKAGE variable needs to be set"
exit $?
fi
MODULE="$PACKAGE"
[ -z "$DATADIR" ] && DATADIR="$PREFIX/share" [ -z "$DATADIR" ] && DATADIR="$PREFIX/share"
instdir="$DATADIR/gtk-doc/html" instdir="$DATADIR/gtk-doc/html"