popped all patches

[ckermit.git] / makefile

diff --git a/makefile b/makefile
index 2490947..c2380eb 100644 (file)
--- a/makefile
+++ b/makefile
@@ -998,7 +998,7 @@ install:
        echo "RmF $(DESTDIR)$(BINDIR)/kermit-sshsub" >&3;\
        echo "RmF $(DESTDIR)$(BINDIR)/kermit" >&3;\
        if test -f ckermit.ini; then\
-               echo "#!$(BINDIR)/kermit" >\
+               echo "#!$(DESTDIR)$(BINDIR)/kermit" >\
                        $(DESTDIR)$(BINDIR)/_tmp.ini;\
                cat ckermit.ini >> $(DESTDIR)$(BINDIR)/_tmp.ini;\
                mv $(DESTDIR)$(BINDIR)/_tmp.ini\
@@ -1019,20 +1019,20 @@ install:
        echo " for details.";\
        echo;\
        echo MANDIR=$(MANDIR);\
-       if test -n "$(DESTDIR)$(MANDIR)"; then\
-               if test -d $(DESTDIR)$(MANDIR); then\
-                       echo  "$(DESTDIR)$(MANDIR) exists...";\
+       if test -n "$(MANDIR)"; then\
+               if test -d $(MANDIR); then\
+                       echo  "$(MANDIR) exists...";\
                else\
-                       echo "Creating $(DESTDIR)$(MANDIR)...";\
-                       mkdir $(DESTDIR)$(MANDIR) || exit 1;\
-                       chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
+                       echo "Creating $(MANDIR)...";\
+                       mkdir $(MANDIR) || exit 1;\
+                       chmod 755 $(MANDIR) || exit 1;\
                fi;\
                echo "Installing man page...";\
-               rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
-               cp    ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
-               chmod 644       $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
+               rm -f $(MANDIR)/kermit.$(MANEXT);\
+               cp    ckuker.nr $(MANDIR)/kermit.$(MANEXT) || exit 1;\
+               chmod 644       $(MANDIR)/kermit.$(MANEXT) || exit 1;\
                echo 'set flag=f\nPrC Removing man pages' >&3;\
-               echo "RmF $(DESTDIR)$(MANDIR)/kermit.$(MANEXT)" >&3;\
+               echo "RmF $(MANDIR)/kermit.$(MANEXT)" >&3;\
                echo 'EfM' >&3;\
                echo;\
        else\