[patch] New awl_location patch

awl_location.patch (text/plain), 1.89 KB, created by François Périchon on 2013-08-23 08:13:13 UTC

diff -rupN davical-1.1.1.orig/dba/create-database.sh davical-1.1.1/dba/create-database.sh
--- davical-1.1.1.orig/dba/create-database.sh	2013-08-23 09:48:27.000000000 +0200
+++ davical-1.1.1/dba/create-database.sh	2013-08-23 09:54:09.000000000 +0200
@@ -22,8 +22,11 @@ if ! testawldir "${AWLDIR}"; then
   if ! testawldir "${AWLDIR}"; then
     AWLDIR="/usr/local/share/awl"
     if ! testawldir "${AWLDIR}"; then
-      echo "Unable to find AWL libraries"
-      exit 1
+      AWLDIR="/usr/share/php/awl"
+      if ! testawldir "${AWLDIR}"; then
+        echo "Unable to find AWL libraries"
+        exit 1
+      fi
     fi
   fi
 fi
diff -rupN davical-1.1.1.orig/scripts/po/rebuild-translations.sh davical-1.1.1/scripts/po/rebuild-translations.sh
--- davical-1.1.1.orig/scripts/po/rebuild-translations.sh	2013-08-23 09:48:27.000000000 +0200
+++ davical-1.1.1/scripts/po/rebuild-translations.sh	2013-08-23 09:49:02.000000000 +0200
@@ -10,7 +10,7 @@
 PODIR="po"
 LOCALEDIR="locale"
 APPLICATION="davical"
-AWL_LOCATION="../awl"
+AWL_LOCATION="/usr/share/php/awl/inc"
 
 if [ ! -d "${AWL_LOCATION}" ]; then
   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
@@ -25,7 +25,8 @@ fi
 
 egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
 sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
-sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
+sed "s:/awl/inc/:/awl/:" ${PODIR}/pofilelist.tmp1 >> ${PODIR}/pofilelist.tmp2
+sort ${PODIR}/pofilelist.tmp2 | uniq > ${PODIR}/pofilelist.tmp
 xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
 sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
 rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1