From 1a41c6ae7c207e307a976d333198e53db400c99f Mon Sep 17 00:00:00 2001 From: hpa Date: Tue, 27 Nov 2001 10:18:11 +0000 Subject: [PATCH] Use $(LN_S) --- MCONFIG.in | 3 +++ configure.in | 1 + tftpd/Makefile | 11 ++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/MCONFIG.in b/MCONFIG.in index 85f2d40..68aab37 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -35,6 +35,9 @@ X = @EXEEXT@ # Install into alternate root area, e.g. for package generation INSTALLROOT = +# Link +LN_S = @LN_S@ + # Install program INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/configure.in b/configure.in index 65ef114..fefa2bc 100644 --- a/configure.in +++ b/configure.in @@ -187,6 +187,7 @@ AC_SUBST(TFTPD_LIBS) AC_SUBST(LIBOBJS) AC_SUBST(TFTPDOBJS) +AC_PROG_LN_S AC_PROG_RANLIB AC_PROG_INSTALL diff --git a/tftpd/Makefile b/tftpd/Makefile index b30d4a0..0729a26 100644 --- a/tftpd/Makefile +++ b/tftpd/Makefile @@ -11,10 +11,11 @@ all: tftpd$(X) tftpd.8 tftpd$(X): $(OBJS) $(CC) $(LDFLAGS) $^ $(TFTPD_LIBS) -o $@ -tftpsubs.c: - ln -sf ../tftp/tftpsubs.c . -tftpsubs.h: - ln -sf ../tftp/tftpsubs.h . +tftpsubs.c: + $(LN_S) -f ../tftp/tftpsubs.c . + +tftpsubs.h: + $(LN_S) -f ../tftp/tftpsubs.h . $(OBJS): tftpsubs.h @@ -25,7 +26,7 @@ install: all mkdir -p $(INSTALLROOT)$(SBINDIR) $(INSTALLROOT)$(MANDIR)/man8 $(INSTALL_PROGRAM) tftpd$(X) $(INSTALLROOT)$(SBINDIR)/in.tftpd $(INSTALL_DATA) tftpd.8 $(INSTALLROOT)$(MANDIR)/man8/in.tftpd.8 - cd $(INSTALLROOT)$(MANDIR)/man8 && ln -sf in.tftpd.8 tftpd.8 + cd $(INSTALLROOT)$(MANDIR)/man8 && $(LN_S) -f in.tftpd.8 tftpd.8 clean: rm -f *.o *.obj *.exe tftpd tftpsubs.c tftpsubs.h tftpd.8