From b54a8bcb895c27308ee66c0374ea4eff524c98a1 Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Sun, 13 May 2007 15:03:38 +0000 Subject: [PATCH] use proper modulesdir --- apps/irssi/src/fe-common/silc/Makefile.am | 7 ++++--- apps/irssi/src/silc/core/Makefile.am | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/irssi/src/fe-common/silc/Makefile.am b/apps/irssi/src/fe-common/silc/Makefile.am index 6b25109c..29514847 100644 --- a/apps/irssi/src/fe-common/silc/Makefile.am +++ b/apps/irssi/src/fe-common/silc/Makefile.am @@ -1,6 +1,7 @@ -modulesdir=dummy include $(top_srcdir)/Makefile.defines.in +moduledir = $(silc_modulesdir) + IRSSI_INCLUDE=../../.. if SILCPLUGIN @@ -9,7 +10,7 @@ NILB= LTLB= libfe_common_silc.la LDFLGS= \ -avoid-version \ - -rpath $(modulesdir) + -rpath $(moduledir) else EXTRA_CFLAGS= NILB= libfe_common_silc.la @@ -45,7 +46,7 @@ ADD_INCLUDES = \ $(EXTRA_CFLAGS) noinst_LTLIBRARIES = $(NILB) -modules_LTLIBRARIES = $(LTLB) +module_LTLIBRARIES = $(LTLB) libfe_common_silc_la_LDFLAGS = \ $(LDFGS) diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am index a3ea1c69..0a8a9dfd 100644 --- a/apps/irssi/src/silc/core/Makefile.am +++ b/apps/irssi/src/silc/core/Makefile.am @@ -1,6 +1,8 @@ -modulesdir=dummy include $(top_srcdir)/Makefile.defines.in +moduledir = $(silc_modulesdir) + + IRSSI_INCLUDE=../../.. if SILCPLUGIN @@ -12,7 +14,7 @@ LTLB= libsilc_core.la NILB= LBLDFLGS= \ -avoid-version \ - -rpath $(modulesdir) + -rpath $(moduledir) else EXTRA_CFLAGS= LBDD= @@ -32,7 +34,7 @@ ADD_INCLUDES = \ $(EXTRA_CFLAGS) noinst_LTLIBRARIES= $(NILB) -modules_LTLIBRARIES = $(LTLB) +module_LTLIBRARIES = $(LTLB) libsilc_core_la_SOURCES = \ clientutil.c \ -- 2.24.0