This commit was generated by cvs2svn to compensate for changes in r158,

[gnokii.git] / Makefile.global.in

diff --git a/Makefile.global.in b/Makefile.global.in
index 23fa672..b06e08c 100644 (file)
--- a/Makefile.global.in
+++ b/Makefile.global.in
@@ -23,11 +23,11 @@ exec_prefix    = @exec_prefix@
 bindir         = @bindir@
 sbindir        = @sbindir@
 xbindir        = ${prefix}/X11R6/bin/
-libdir         = @libdir@
+libdir         = @libdir@/${PACKAGE}
 xgnokii_libdir = @XGNOKIIDIR@/@XPACKAGE@
 man1dir        = @mandir@/man1/
 man8dir        = @mandir@/man8/
-xmandir        = @mandir@/man1/
+xmandir        = ${prefix}/X11R6/man/man1/
 docdir         = ${prefix}/doc/${PACKAGE}
 locdir         = @datadir@/locale
 
@@ -73,5 +73,5 @@ endif
 
 
 CFLAGS += -I$(GNOKII_INCLUDE)
-LDFLAGS = $(LIBS) -Wl,--rpath -Wl,$(libdir)
+LDFLAGS = $(LIBS)