From 65b82eeee5738a7184c756b9f07d35a53fe657b8 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 9 Jan 1997 21:49:29 +0000 Subject: [PATCH] fixed @foodir@ git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1153 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/Makefile.in | 2 -- appl/ftp/common/Makefile.in | 2 -- appl/telnet/Makefile.in | 3 --- appl/telnet/libtelnet/Makefile.in | 2 -- lib/auth/afskauthlib/Makefile.in | 3 +-- lib/auth/pam/Makefile.in | 3 +-- lib/auth/sia/Makefile.in | 3 +-- lib/editline/Makefile.in | 3 +-- lib/kafs/Makefile.in | 3 +-- lib/otp/Makefile.in | 3 +-- lib/roken/Makefile.in | 3 +-- lib/sl/Makefile.in | 3 +-- 12 files changed, 8 insertions(+), 25 deletions(-) diff --git a/appl/ftp/Makefile.in b/appl/ftp/Makefile.in index c794fc1a9..48da6c942 100644 --- a/appl/ftp/Makefile.in +++ b/appl/ftp/Makefile.in @@ -16,8 +16,6 @@ CFLAGS = @CFLAGS@ INSTALL = @INSTALL@ prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib SUBDIRS=common ftp ftpd diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in index 3dcb30bd4..da99cf2dc 100644 --- a/appl/ftp/common/Makefile.in +++ b/appl/ftp/common/Makefile.in @@ -15,8 +15,6 @@ CFLAGS = @CFLAGS@ INSTALL = @INSTALL@ prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib SOURCES = base64.c glob.c OBJECTS = $(libcommon_OBJS) diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in index 41fa89b43..5acc4a35b 100644 --- a/appl/telnet/Makefile.in +++ b/appl/telnet/Makefile.in @@ -14,9 +14,6 @@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ INSTALL = @INSTALL@ -prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib SUBDIRS=libtelnet telnet telnetd diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in index 888586109..a6a2332a5 100644 --- a/appl/telnet/libtelnet/Makefile.in +++ b/appl/telnet/libtelnet/Makefile.in @@ -13,8 +13,6 @@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib SOURCES=auth.c encrypt.c genget.c enc_des.c misc.c kerberos.c read_password.c diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in index 7099fa015..9e0aae943 100644 --- a/lib/auth/afskauthlib/Makefile.in +++ b/lib/auth/afskauthlib/Makefile.in @@ -19,8 +19,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = @REAL_PICFLAGS@ SHARED = @REAL_SHARED@ diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in index 3689d1227..8065ba133 100644 --- a/lib/auth/pam/Makefile.in +++ b/lib/auth/pam/Makefile.in @@ -18,8 +18,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = @REAL_PICFLAGS@ SHARED = @REAL_SHARED@ diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in index 4a9a01ed1..ce1d27536 100644 --- a/lib/auth/sia/Makefile.in +++ b/lib/auth/sia/Makefile.in @@ -18,8 +18,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = @REAL_PICFLAGS@ SHARED = @REAL_SHARED@ diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in index 3db116ca1..1df56a0c4 100644 --- a/lib/editline/Makefile.in +++ b/lib/editline/Makefile.in @@ -18,8 +18,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = @PICFLAGS@ diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in index b3c6a1abb..a41d067d3 100644 --- a/lib/kafs/Makefile.in +++ b/lib/kafs/Makefile.in @@ -18,8 +18,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = @PICFLAGS@ diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in index 17ce517c1..5032f93fa 100644 --- a/lib/otp/Makefile.in +++ b/lib/otp/Makefile.in @@ -19,8 +19,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = @PICFLAGS@ diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in index 302f9a9a9..15894b983 100644 --- a/lib/roken/Makefile.in +++ b/lib/roken/Makefile.in @@ -19,8 +19,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = # @PICFLAGS@ diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in index e761666e7..d6a574208 100644 --- a/lib/sl/Makefile.in +++ b/lib/sl/Makefile.in @@ -18,8 +18,7 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs prefix = @prefix@ -exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +libdir = @libdir@ PICFLAGS = @PICFLAGS@