| 1 |
ottxor 13/09/28 02:30:06 |
| 2 |
|
| 3 |
Modified: build-docbook-catalog Makefile |
| 4 |
Log: |
| 5 |
merge prefix patches |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.20 build-docbook-catalog/build-docbook-catalog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.20&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?rev=1.20&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/build-docbook-catalog?r1=1.19&r2=1.20 |
| 13 |
|
| 14 |
Index: build-docbook-catalog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v |
| 17 |
retrieving revision 1.19 |
| 18 |
retrieving revision 1.20 |
| 19 |
diff -u -r1.19 -r1.20 |
| 20 |
--- build-docbook-catalog 28 Mar 2012 19:34:46 -0000 1.19 |
| 21 |
+++ build-docbook-catalog 28 Sep 2013 02:30:06 -0000 1.20 |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
#!/bin/bash |
| 24 |
-# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.19 2012/03/28 19:34:46 vapier Exp $ |
| 25 |
+# $Header: /var/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.20 2013/09/28 02:30:06 ottxor Exp $ |
| 26 |
# |
| 27 |
# build-docbook-catalog: populate /etc/xml/docbook based in |
| 28 |
# installed docbook-xml-dtd versions. |
| 29 |
@@ -9,15 +9,17 @@ |
| 30 |
# written by Aron Griffis |
| 31 |
# |
| 32 |
|
| 33 |
-ROOTCONFDIR=/etc/xml |
| 34 |
+EPREFIX= |
| 35 |
+ROOTCONFDIR="${EPREFIX}"/etc/xml |
| 36 |
ROOTCATALOG=${ROOTCONFDIR}/catalog |
| 37 |
CATALOG=${ROOTCONFDIR}/docbook |
| 38 |
-DOCBOOKDIR=/usr/share/sgml/docbook |
| 39 |
+DOCBOOKDIR="${EPREFIX}"/usr/share/sgml/docbook |
| 40 |
DTDS= |
| 41 |
LATEST_DTD= |
| 42 |
LATEST_DATE= |
| 43 |
VERBOSE=false |
| 44 |
ZERO=${0##*/} |
| 45 |
+GETOPT=getopt |
| 46 |
|
| 47 |
# |
| 48 |
# usage! |
| 49 |
@@ -41,7 +43,7 @@ |
| 50 |
main() { |
| 51 |
local d v opts |
| 52 |
|
| 53 |
- opts=$(getopt -o hr:v --long help,root:,verbose -n "${ZERO}" -- "$@") || exit 1 |
| 54 |
+ opts=$(${GETOPT} -o hr:v --long help,root:,verbose -n "${ZERO}" -- "$@") || exit 1 |
| 55 |
eval set -- "${opts}" |
| 56 |
while true; do |
| 57 |
case $1 in |
| 58 |
@@ -65,10 +67,14 @@ |
| 59 |
mkdir -p "${ROOT}${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}" |
| 60 |
fi |
| 61 |
|
| 62 |
+ local lock="${ROOT}${ROOTCONFDIR}"/build-docbook-catalog-lock |
| 63 |
( |
| 64 |
# Lock the dir to avoid trashing other runs that might |
| 65 |
# be running parallel. |
| 66 |
- flock 123 || error "unable to lock ${ROOTCONFDIR}" |
| 67 |
+ touch "${lock}".$$ && \ |
| 68 |
+ until ln "${lock}".$$ "${lock}" 2>/dev/null; do sleep 1; done && \ |
| 69 |
+ rm "${lock}".$$ |
| 70 |
+ [[ -f ${lock}.$$ ]] && error "unable to lock ${ROOTCONFDIR}" |
| 71 |
|
| 72 |
create_catalogs # will exit on error |
| 73 |
for type in xsl xsl-ns xsl-saxon xsl-xalan; do |
| 74 |
@@ -90,7 +96,8 @@ |
| 75 |
populate_entities |
| 76 |
fi |
| 77 |
|
| 78 |
- ) 123>"${ROOT}${ROOTCONFDIR}/.keep" |
| 79 |
+ ) |
| 80 |
+ rm "${lock}" |
| 81 |
|
| 82 |
exit 0 |
| 83 |
} |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.3 build-docbook-catalog/Makefile |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/Makefile?rev=1.3&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/Makefile?rev=1.3&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-src/build-docbook-catalog/Makefile?r1=1.2&r2=1.3 |
| 92 |
|
| 93 |
Index: Makefile |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-src/build-docbook-catalog/Makefile,v |
| 96 |
retrieving revision 1.2 |
| 97 |
retrieving revision 1.3 |
| 98 |
diff -u -r1.2 -r1.3 |
| 99 |
--- Makefile 2 Oct 2012 23:06:28 -0000 1.2 |
| 100 |
+++ Makefile 28 Sep 2013 02:30:06 -0000 1.3 |
| 101 |
@@ -4,9 +4,10 @@ |
| 102 |
|
| 103 |
all: |
| 104 |
|
| 105 |
-SYSCONFDIR = /etc |
| 106 |
+EPREFIX = |
| 107 |
+SYSCONFDIR = $(EPREFIX)/etc |
| 108 |
CONFDIR = $(SYSCONFDIR)/xml |
| 109 |
-PREFIX = /usr |
| 110 |
+PREFIX = $(EPREFIX)/usr |
| 111 |
SBINDIR = $(PREFIX)/sbin |
| 112 |
|
| 113 |
install: |
Archives