`make dist` workaround update

--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello,

The default `make dist` doesn't work in conglomerate svn source tree.
That is because the various test aren't met.

With the attached patch is the "upstream script" "make cvs tarball"
up-to-date, which makes a `make dist` possible by `uss/mkcvstarball`


Cheers
Geert Stappers

P.S.
I used to commit changes like these myself,
but I have currently no gnome subversion write acces.
I would be nice if some commits it.


--Q68bSM7Ycu6FN28Q
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="makedistworkaround.patch"

Index: uss/mkcvstarball
===================================================================
--- uss/mkcvstarball	(revision 2167)
+++ uss/mkcvstarball	(working copy)
@@ -1,8 +1,19 @@
 #!/bin/bash
+# make cvs tarball
+# script to make a tarball from the version control source tree (CVS, SVN, etc)
+# it exists because the generated Makefiles do many check which aren't passed 
+# With the cheats in this script is a `make dist` possible
 
 # temporary modified files
-TMPMOD="configure.in ChangeLog"
+TMPMOD="configure.ac ChangeLog"
 
+# intltool isn't yet configured right
+for intfile in extract merge update
+do
+  if=intltool-${intfile}.in
+  [ ! -f ${if} ] && touch ${if}
+done
+
 # preserve
 for TM in ${TMPMOD}
 do
@@ -16,10 +27,10 @@
   ( date -R; echo "This is prelease ${1}"; echo; cat ChangeLog.tm ) > ChangeLog
   sed -e "s/^AC_INIT(\(.*\), \(.*\))/AC_INIT(\1, \2pre${1})/" \
       -e "/doc\/reference/d" \
-    configure.in.tm > configure.in
+    configure.ac.tm > configure.ac
 else
   sed -e "/doc\/reference/d" \
-    configure.in.tm > configure.in
+    configure.ac.tm > configure.ac
 fi
 
 # don't spent time on the poor gtk-doc stuff
@@ -34,8 +45,9 @@
 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes make distcheck
 if [ $? -ne 0 ]
 then
+ echo *********************
  echo make distcheck failed
- exit 1
+ echo *********************
 fi
 
 # restore the temporary modified files
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 2167)
+++ Makefile.am	(working copy)
@@ -2,22 +2,40 @@
 
 NULL =
 
+INTLTOOL_FILES = \
+  intltool-extract.in \
+  intltool-merge.in \
+  intltool-update.in \
+  $(NULL)
+
+AM_CPPFLAGS = ... -DPROGRAMNAME_LOCALEDIR=\"${PROGRAMNAME_LOCALEDIR}\"
+
 EXTRA_DIST = BUGS	\
-  README.xml            \
+  README.xml		\
   .diffexclude		\
   conglomerate.spec.in	\
   intltool-extract.in	\
   intltool-merge.in	\
   intltool-update.in	\
   omf.make              \
-  xmldocs.make          \
+  xmldocs.make		\
+  $(INTLTOOL_FILES)	\
   $(NULL)
 
-## # when we switch to automake1.7, we will need this:
-##distuninstallcheck_listfiles = find . \
-##   -type f -print | \
-##   grep -v '^\./var/scrollkeeper' | \
-##   grep -v '^\./share/gnome/help/conglomerate/C/faq.xml'
-## # but it will need more to get a fine `make distcheck`
+DISTCLEANFILES = \
+  intltool-extract \
+  intltool-merge \
+  intltool-update \
+  $(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = \
+  --disable-schemas-install \
+  --disable-scrollkeeper \
+  --enable-gtk-doc \
+  $(NULL)
+
+# files to skip during `make dist`
+distuninstallcheck_listfiles = $(shell find . \
+   -type f -print | \
+   grep -v '^\./var/scrollkeeper' | \
+   grep -v '^\./share/gnome/help/conglomerate/C/faq.xml' )
Index: configure.ac
===================================================================
--- configure.ac	(revision 2167)
+++ configure.ac	(working copy)
@@ -21,7 +21,7 @@
 AC_PROG_INSTALL
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
-AC_PROG_INTLTOOL([0.30])
+AC_PROG_INTLTOOL([0.35.0])
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
@@ -31,6 +31,9 @@
 
 AM_GLIB_GNU_GETTEXT
 
+PROGRAMNAME_LOCALEDIR=[${datadir}/locale]
+AC_SUBST(PROGRAMNAME_LOCALEDIR)
+
 dnl --- Package configuration ---
 
 GTK2_REQUIRED=2.10.0

--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset="iso-8859-1"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

_______________________________________________
Conglomerate-devel mailing list
[email protected]
http://lists.copyleft.no/mailman/listinfo/conglomerate-devel

--Q68bSM7Ycu6FN28Q--