On Thu, 8 Apr 2010, Brad Jorsch wrote:
> You also need to add "-I m4" to the aclocal invocation on the next line,
> to tell it to use the files in the m4 directory. After doing that, a
> dpkg-buildpackage -b -uc on the 'next' branch successfully completed for
> me here, although I haven't checked that everything in the resulting
> debs is actually correct.
i think the whole concept is wrong (there may have been historical
reasons for this, but this is beyond the point).
the debian stuff should not have to screw around with the innards of
the autoconf stuff, just call configure and stuff. if it really feels
to have to regen stuff, it should just call autogen.sh (who wants to
maintain the same thing twice?).
try this for something that tries to have the debian/ stuff do away
with touching autoconf (apart from creating a configure if needed). it
builds, but i haven't checked the debs either.
i think ultimately john should be stepping in, stopping us before we
do something completely stupid, and re-do the whole debian part. he
should know best ;)
>From 58336ed3b43c47780287bd0e27bddb8907836882 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Thu, 8 Apr 2010 23:48:06 +0200
Subject: [PATCH] Fix Debian builds
---
debian/rules | 51 ++++++++-------------------------------------------
1 files changed, 8 insertions(+), 43 deletions(-)
diff --git a/debian/rules b/debian/rules
index 47a520d..7559e93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,6 @@ endif
LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po))
#LINGUAS := $(filter-out zh_TW.Big5, $(LINGUAS))
-# Options, options and more options!!!
-
XLOCALE := --disable-locale
MODELOCK := --enable-modelock
@@ -87,10 +85,8 @@ LIBWRASTER_TMP := $(DEBTMPDIR)/../$(LIBWRASTER)
LIBWINGS := libwings-dev
LIBWINGS_TMP := $(DEBTMPDIR)/../$(LIBWINGS)
-LTMAIN := $(shell: find /usr/share/libtool/ -name ltmain.sh | head
-1)
-
RM := rm -f
-RMDIR := rmdir --ignore-fail-on-non-empty
+RMDIR := rmdir --ignore-fail-on-non-empty
COMMON_OPTIONS := --prefix=$(BASEDIR) \
--mandir=$(MANDIR) \
@@ -102,11 +98,6 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \
--with-gnustepdir=$(GNUSTEPDIR) \
--with-xft
-AUTOMAKE_FILES := $(shell find -name Makefile.am)
-IN_MAKEFILES := $(patsubst %.am,%.in,$(AUTOMAKE_FILES))
-IN_FILES := $(filter-out $(IN_MAKEFILES),$(shell find -name \*.in))
-GEN_FILES := $(patsubst %.in,%,$(IN_FILES))
-
LIST_PATCHES := find debian/patches -mindepth 1 -maxdepth 1 -name \*.diff
-type f | sort
RLIST_PATCHES := find debian/patches -mindepth 1 -maxdepth 1 -name \*.diff
-type f | sort -r
@@ -178,26 +169,12 @@ unpatch-wmaker:
clean:
dh_testdir
dh_testroot
- -$(MAKE) distclean
- debian/rules unpatch-wmaker
- $(RM) \
- config.log
- $(RM) *-stamp \
- debian/*.files \
- libtool \
- src/config.h.in \
- debian/shlibs.local
-# debian/conffiles
$(RM) -r $(WMAKER_BD)
-ifeq (skip,)
- $(RM) \
- configure \
- config.guess \
- config.sub \
- aclocal.m4 \
- ltmain.sh
- $(RM) $(IN_MAKEFILES) $(GEN_FILES)
-endif
+ $(RM) *-stamp \
+ debian/*.files \
+ debian/shlibs.local \
+ debian/conffiles
+ debian/rules unpatch-wmaker
dh_clean
binary-indep: build
@@ -382,19 +359,7 @@ debian/libwings-dev.files: build
debian/shlibs.local:
echo 'libwraster $(patsubst libwraster%,%, $(LIBWRASTER))
$(LIBWRASTER) $(libwraster_deps)' > $@
-aclocal.m4: configure.ac
- aclocal -I m4
-
-src/config.h.in: configure.ac
- autoheader
-
-ltmain.sh: aclocal.m4 $(LTMAIN)
- libtoolize --force --copy --automake
-
-$(IN_MAKEFILES): %.in: ltmain.sh %.am src/config.h.in
- automake --add-missing --gnu --include-deps
-
-configure: $(IN_MAKEFILES) configure.ac
- autoconf
+configure: configure.ac
+ $(TOPSRCDIR)/autogen.sh
.PHONY: binary binary-arch binary-indep binary-custom clean build
unpatch-wmaker
--
1.7.0
--
[-]
mkdir /nonexistentFrom 58336ed3b43c47780287bd0e27bddb8907836882 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Thu, 8 Apr 2010 23:48:06 +0200
Subject: [PATCH] Fix Debian builds
---
debian/rules | 51 ++++++++-------------------------------------------
1 files changed, 8 insertions(+), 43 deletions(-)
diff --git a/debian/rules b/debian/rules
index 47a520d..7559e93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,6 @@ endif
LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po))
#LINGUAS := $(filter-out zh_TW.Big5, $(LINGUAS))
-# Options, options and more options!!!
-
XLOCALE := --disable-locale
MODELOCK := --enable-modelock
@@ -87,10 +85,8 @@ LIBWRASTER_TMP := $(DEBTMPDIR)/../$(LIBWRASTER)
LIBWINGS := libwings-dev
LIBWINGS_TMP := $(DEBTMPDIR)/../$(LIBWINGS)
-LTMAIN := $(shell: find /usr/share/libtool/ -name ltmain.sh | head -1)
-
RM := rm -f
-RMDIR := rmdir --ignore-fail-on-non-empty
+RMDIR := rmdir --ignore-fail-on-non-empty
COMMON_OPTIONS := --prefix=$(BASEDIR) \
--mandir=$(MANDIR) \
@@ -102,11 +98,6 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \
--with-gnustepdir=$(GNUSTEPDIR) \
--with-xft
-AUTOMAKE_FILES := $(shell find -name Makefile.am)
-IN_MAKEFILES := $(patsubst %.am,%.in,$(AUTOMAKE_FILES))
-IN_FILES := $(filter-out $(IN_MAKEFILES),$(shell find -name \*.in))
-GEN_FILES := $(patsubst %.in,%,$(IN_FILES))
-
LIST_PATCHES := find debian/patches -mindepth 1 -maxdepth 1 -name \*.diff -type f | sort
RLIST_PATCHES := find debian/patches -mindepth 1 -maxdepth 1 -name \*.diff -type f | sort -r
@@ -178,26 +169,12 @@ unpatch-wmaker:
clean:
dh_testdir
dh_testroot
- -$(MAKE) distclean
- debian/rules unpatch-wmaker
- $(RM) \
- config.log
- $(RM) *-stamp \
- debian/*.files \
- libtool \
- src/config.h.in \
- debian/shlibs.local
-# debian/conffiles
$(RM) -r $(WMAKER_BD)
-ifeq (skip,)
- $(RM) \
- configure \
- config.guess \
- config.sub \
- aclocal.m4 \
- ltmain.sh
- $(RM) $(IN_MAKEFILES) $(GEN_FILES)
-endif
+ $(RM) *-stamp \
+ debian/*.files \
+ debian/shlibs.local \
+ debian/conffiles
+ debian/rules unpatch-wmaker
dh_clean
binary-indep: build
@@ -382,19 +359,7 @@ debian/libwings-dev.files: build
debian/shlibs.local:
echo 'libwraster $(patsubst libwraster%,%, $(LIBWRASTER)) $(LIBWRASTER) $(libwraster_deps)' > $@
-aclocal.m4: configure.ac
- aclocal -I m4
-
-src/config.h.in: configure.ac
- autoheader
-
-ltmain.sh: aclocal.m4 $(LTMAIN)
- libtoolize --force --copy --automake
-
-$(IN_MAKEFILES): %.in: ltmain.sh %.am src/config.h.in
- automake --add-missing --gnu --include-deps
-
-configure: $(IN_MAKEFILES) configure.ac
- autoconf
+configure: configure.ac
+ $(TOPSRCDIR)/autogen.sh
.PHONY: binary binary-arch binary-indep binary-custom clean build unpatch-wmaker
--
1.7.0
