CVS:dmake-deb/patches dmakeroot-from-configure.diff,1.2,1.3 run-autogen.sh.diff,NONE,1.1

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/dmake-deb/patches
In directory gluck:/tmp/cvs-serv31586/patches

Added Files:
	dmakeroot-from-configure.diff run-autogen.sh.diff 
Log Message:
oops, readd dmakeroot-from-configure.diff and updated run-autogen-sh.diff, still needed

--- NEW FILE: dmakeroot-from-configure.diff ---
diff -Nurd dmake.orig/configure.in dmake.1/configure.in
--- dmake.orig/configure.in	2003-10-08 16:34:27.000000000 +0200
+++ dmake.1/configure.in	2003-10-10 14:34:34.000000000 +0200
@@ -130,6 +130,7 @@
 AC_SUBST(OS_VERSION)
 AC_SUBST(OS_SUBDIRS)
 AC_SUBST(OS_LIBRARY)
+AC_DEFINE_UNQUOTED(OS_VERSION, "$OS_VERSION", [Subtype of OS])
 
 AM_CONFIG_HEADER(config.h)
 
diff -Nurd dmake.orig/unix/Makefile.am dmake.1/unix/Makefile.am
--- dmake.orig/unix/Makefile.am	2002-10-02 15:42:16.000000000 +0200
+++ dmake.1/unix/Makefile.am	2003-10-10 14:35:42.000000000 +0200
@@ -2,7 +2,7 @@
 noinst_LIBRARIES = libunix.a
 
 libunix_a_SOURCES = arlib.c dcache.c dirbrk.c rmprq.c ruletab.c runargv.c tempnam.c
-
+libunix_a_CFLAGS = '-DDATADIR="@datadir@"'
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/unix/@OS_VERSION@/gnu -I$(top_srcdir)/unix  -I$(top_srcdir)/unix/@OS_VERSION@
 
diff -Nurd dmake.orig/unix/ruletab.c dmake.1/unix/ruletab.c
--- dmake.orig/unix/ruletab.c	2003-03-25 15:02:42.000000000 +0100
+++ dmake.1/unix/ruletab.c	2003-10-10 14:35:55.000000000 +0200
@@ -88,10 +88,19 @@
  * may be overridden inside the .STARTUP makefile, they are here
  * strictly so that dmake can parse the STARTUP makefile */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if !defined(DATADIR) || !defined(OS_VERSION)
+#error DATADIR and OS_VERSION should be defined on the compiler command line or in config.h
+#endif
+
 static char *_rules[] = {
 	"MAXPROCESSLIMIT := 10",
 	"MAXLINELENGTH := 8190",
-#include "dmakeroot.h"
+	"DMAKEROOT := " DATADIR "/startup",
+	"OS := " OS_VERSION,
 	".IMPORT .IGNORE: DMAKEROOT SOLARVER UPD INPATH OS UPDMINOREXT",
 	".MAKEFILES : makefile.mk Makefile makefile",
 	".SOURCE    : .NULL",

--- NEW FILE: run-autogen.sh.diff ---
diff -urN dmake-4.3.bak/aclocal.m4 dmake-4.3/aclocal.m4
--- dmake-4.3.bak/aclocal.m4	2004-10-12 20:47:45.000000000 +0200
+++ dmake-4.3/aclocal.m4	2005-02-09 08:42:11.000000000 +0100
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,9 +11,146 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
[...6592 lines suppressed...]
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.