more srcdir fixes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3792 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in
index 9ffba0b8f1ecd22bf8c1a9ab409fd3148dccf172..cb9bd72a4abf2e1e85bb428b864e964b5afec5c1 100644 (file)
--- a/src/isode/pepsy/Makefile.in
+++ b/src/isode/pepsy/Makefile.in
@@ -107,6 +107,7 @@ inst-pepsy: $(BINDIR)pepsy
 #              -@echo ""
 
 pepsy:         xpepsy
+               -rm -f pepsy.old
                -mv pepsy pepsy.old
                $(LN) xpepsy pepsy
                -@echo ""
@@ -201,7 +202,7 @@ $(PEPSYDIR)$(TARGET):       $(TARGET)
 UNIV_tables.o: UNIV_tables.c UNIV-types.h
 
 UNIV-types.h UNIV_tables.c: UNIV.py xpepsy
-               ./xpepsy -A -f -h -m UNIV.py
+               ./xpepsy -A -f -h -m $(srcdir)/UNIV.py
 
 l-libpepsy:    $(CFILES) $(T_FILES) true
                $(LINT) $(LFLAGS) $(CFILES) $(T_FILES) \

diff --git a/src/isode/support/Makefile.in b/src/isode/support/Makefile.in
index f34eb6e6ab3c9e797e2afe7a2b8abd935735525a..807ed167dae3e69a02206520e627c13c322eed36 100644 (file)
--- a/src/isode/support/Makefile.in
+++ b/src/isode/support/Makefile.in
@@ -11,8 +11,8 @@ TOPDIR = $(BUILDTOP)
 OPTIONS        =       -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) 
 
-HDIR   =       $(TOPDIR)isode/h/
-UTILDIR        =       $(TOPDIR)isode/util/
+HDIR   =       $(srcdir)/$(TOPDIR)isode/h/
+UTILDIR        =       $(srcdir)/$(BUILDTOP)isode/util/
 INCDIRM        =       $(HDIR)
 INCDIR =       $(INCDIRM)/
 PEPSYDIRM=     $(INCDIR)pepsy