$NetBSD: patch-aa,v 1.2 1999/10/22 10:15:48 fredb Exp $ --- Makefile.in.orig Mon Aug 31 13:40:14 1998 +++ Makefile.in Fri Oct 22 05:00:50 1999 @@ -37,12 +37,13 @@ MANEXT = 1 INSTALL = @INSTALL@ -BININSTALL = @INSTALL_PROGRAM@ -m 755 +BININSTALL = @INSTALL_PROGRAM@ LIBINSTALL = @INSTALL_DATA@ +SCRIPTINSTALL= @INSTALL_SCRIPT@ HARDLINK = ln -f CC = @CC@ -INCLUDES = @CPPFLAGS@ -Ilibhfs @TCL_INCLUDES@ @TK_INCLUDES@ +INCLUDES = @CPPFLAGS@ @TCL_INCLUDES@ @TK_INCLUDES@ DEFINES = @DEFS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -51,7 +52,7 @@ TKLIBS = @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@ COPTS = @CFLAGS@ -LDOPTS = @LDFLAGS@ -Llibhfs +LDOPTS = @LDFLAGS@ ### END OF USER CUSTOMIZATION ################################################# @@ -67,11 +68,11 @@ TCLTARGETS = hfssh hfs TKTARGETS = xhfs -LIBHFS = libhfs/libhfs.a -INCHFS = libhfs/hfs.h +LIBHFS = +INCHFS = -LIBRSRC = librsrc/librsrc.a -INCRSRC = librsrc/rsrc.h +LIBRSRC = +INCRSRC = HFSUTIL = hfsutil HFSCK = hfsck/hfsck @@ -125,15 +126,14 @@ done install_tcl :: all_tcl - for file in $(TCLTARGETS); do \ - $(BININSTALL) $$file "$(BINDEST)/."; \ - done + $(BININSTALL) hfssh "$(BINDEST)/." + $(SCRIPTINSTALL) hfs "$(BINDEST)/." - if [ -f "$(BINDEST)/hfs" ]; then \ - sed -e '1d' "$(BINDEST)/hfs" > "$(BINDEST)/hfs.new"; \ - $(BININSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \ - rm -f "$(BINDEST)/hfs.new"; \ - fi +# if [ -f "$(BINDEST)/hfs" ]; then \ +# sed -e '1d' "$(BINDEST)/hfs" > "$(BINDEST)/hfs.new"; \ +# $(BININSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \ +# rm -f "$(BINDEST)/hfs.new"; \ +# fi for file in $(TCLDOCS); do \ $(LIBINSTALL) doc/man/$$file \ @@ -239,8 +239,7 @@ -lhfs $(LIBS) $(TCLLIBS) $(LIBOBJS) -o $@ hfs: hfs.tcl hfssh - ( echo "#!./hfssh"; \ - echo "#! /bin/sh"; \ + ( echo "#! /bin/sh"; \ echo "# Start hfssh ... \\"; \ echo 'exec hfssh "$$0" "$$@"'; \ echo; \