Hi! This patch make small modifications to the way cdebconf-entropy is built in order to be able to integrate plugins for frontend other than newt. --- packages/cdebconf-entropy/Makefile.in | 8 +++----- packages/cdebconf-entropy/configure.ac | 12 ++++++------ packages/cdebconf-entropy/debian/changelog | 2 ++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/cdebconf-entropy/Makefile.in b/packages/cdebconf-entropy/Makefile.in index fb49457..972c13e 100644 --- a/packages/cdebconf-entropy/Makefile.in +++ b/packages/cdebconf-entropy/Makefile.in @@ -8,13 +8,11 @@ sharedir=${prefix}/share/debconf mandir=${prefix}/share/man incdir=${prefix}/include/cdebconf -PACKAGE=@PACKAGE@ CC=@CC@ CFLAGS=@CFLAGS@ -I. LDFLAGS=@LDFLAGS@ -FRONTENDS=@FRONTENDS@ -PLUGIN_MODULES=$(addsuffix -plugin-$(PACKAGE).so,$(FRONTENDS)) +PLUGIN_MODULES=@PLUGIN_MODULES@ all: $(PLUGIN_MODULES) @@ -24,8 +22,8 @@ install: $(PLUGIN_MODULES) install -m644 $$p $(DESTDIR)/$(moddir)/$${p%%-*}/$${p#*-} ; \ done -newt-plugin-$(PACKAGE).so: newt-plugin-$(PACKAGE).opic - $(CC) $(LDFLAGS) -shared -lnewt -o $@ newt-plugin-$(PACKAGE).opic +newt-plugin-entropy-text.so: newt-plugin-entropy-text.opic + $(CC) $(LDFLAGS) -shared -lnewt -o $@ $< clean: rm -f $(PLUGIN_MODULES) diff --git a/packages/cdebconf-entropy/configure.ac b/packages/cdebconf-entropy/configure.ac index ab450b3..79c2d16 100644 --- a/packages/cdebconf-entropy/configure.ac +++ b/packages/cdebconf-entropy/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(newt-plugin-entropy-text.c) -PACKAGE=entropy-text +AC_INIT +PACKAGE=entropy AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_PROG_MAKE_SET @@ -12,10 +12,10 @@ if test "$with_debug" == "yes"; then CFLAGS="$CFLAGS -g -D_DEBUG_" fi -AC_CHECK_LIB(newt, newtInit, FRONTENDS="$FRONTENDS newt", echo - "*** Cannot build Newt plugin ***") +AC_CHECK_LIB(newt, newtInit, + PLUGIN_MODULES="$PLUGIN_MODULES newt-plugin-entropy-text.so", + echo "*** Cannot build Newt plugin ***") -AC_SUBST(FRONTENDS) -AC_SUBST(PACKAGE) +AC_SUBST(PLUGIN_MODULES) AC_OUTPUT(Makefile) diff --git a/packages/cdebconf-entropy/debian/changelog b/packages/cdebconf-entropy/debian/changelog index 048ed0a..9c51608 100644 --- a/packages/cdebconf-entropy/debian/changelog +++ b/packages/cdebconf-entropy/debian/changelog @@ -6,6 +6,8 @@ cdebconf-entropy (0.5) UNRELEASED; urgency=low loaded globally. * Set a RPATH to the frontend directory to work around mklibs defiency. * Bump Depends on cdebconf accordingly. + * Rework build system to make room for entropy plugins working with + frontends other than newt. -- Jérémy Bobbio <lunar@debian.org> Tue, 07 Aug 2007 13:35:56 +0200 -- Jérémy Bobbio .''`. lunar@debian.org : :Ⓐ : # apt-get install anarchism `. `'` `-
Attachment:
signature.asc
Description: Digital signature