564a72f782
of ssh now. If anyone knows of a way of making the build dependency here less gross, I'm listening! :)
125 lines
4.7 KiB
Plaintext
125 lines
4.7 KiB
Plaintext
--- Makefile.in.orig Wed Jul 8 09:40:39 1998
|
|
+++ Makefile.in Wed Oct 7 19:11:37 1998
|
|
@@ -294,14 +294,19 @@
|
|
SHELL = /bin/sh
|
|
|
|
GMPDIR = gmp-2.0.2-ssh-2
|
|
-GMPLIBS = -L$(GMPDIR) -lgmp
|
|
-GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
|
|
+# We have the same libgmp in the system, so use it instead
|
|
+GMPINCDIR = /usr/include
|
|
+GMPLIBDIR = /usr/lib
|
|
+GMPLIBS = -lgmp
|
|
+GMPDEP = $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
|
|
|
|
ZLIBDIR = zlib-1.0.4
|
|
-ZLIBDEP = $(ZLIBDIR)/libz.a
|
|
-ZLIBLIBS = -L$(ZLIBDIR) -lz
|
|
+ZLIBINCDIR = /usr/include
|
|
+ZLIBLIBDIR = /usr/lib
|
|
+ZLIBDEP = $(ZLIBINCDIR)/libz.a
|
|
+ZLIBLIBS = -lz
|
|
|
|
-RSAREFDIR = rsaref2
|
|
+RSAREFDIR = ${PORTSDIR}/security/rsaref/work
|
|
RSAREFSRCDIR = $(RSAREFDIR)/source
|
|
|
|
X_CFLAGS = @X_CFLAGS@
|
|
@@ -404,7 +409,7 @@
|
|
$(CC) -o rfc-pg rfc-pg.o
|
|
|
|
.c.o:
|
|
- $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
|
|
+ $(CC) -c -I. $(KERBEROS_INCS) -I../../../rsaref/work -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
|
|
|
|
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
|
|
-rm -f sshd
|
|
@@ -447,19 +452,19 @@
|
|
sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
|
|
chmod +x make-ssh-known-hosts
|
|
|
|
-GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
|
|
- mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
|
|
-$(GMPDIR)/libgmp.a:
|
|
- cd $(GMPDIR); $(MAKE)
|
|
-
|
|
-$(ZLIBDEP):
|
|
- -if test '!' -d $(ZLIBDIR); then \
|
|
- mkdir $(ZLIBDIR); \
|
|
- cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
|
|
- fi
|
|
- cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
|
|
- CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
|
|
- -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
|
|
+#GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
|
|
+# mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
|
|
+#$(GMPDIR)/libgmp.a:
|
|
+# cd $(GMPDIR); $(MAKE)
|
|
+#
|
|
+#$(ZLIBDEP):
|
|
+# -if test '!' -d $(ZLIBDIR); then \
|
|
+# mkdir $(ZLIBDIR); \
|
|
+# cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
|
|
+# fi
|
|
+# cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
|
|
+# CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
|
|
+# -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
|
|
|
|
$(RSAREFSRCDIR)/librsaref.a:
|
|
-if test '!' -d $(RSAREFDIR); then \
|
|
@@ -516,7 +521,7 @@
|
|
# (otherwise it can only log in as the user it runs as, and must be
|
|
# bound to a non-privileged port). Also, password authentication may
|
|
# not be available if non-root and using shadow passwords.
|
|
-install: $(PROGRAMS) make-dirs generate-host-key install-configs
|
|
+install: $(PROGRAMS) make-dirs install-configs
|
|
-rm -f $(install_prefix)$(bindir)/ssh1.old
|
|
-chmod 755 $(install_prefix)$(bindir)/ssh1
|
|
-chmod 755 $(install_prefix)$(bindir)/ssh
|
|
@@ -672,15 +677,15 @@
|
|
|
|
clean:
|
|
-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
|
|
- cd $(GMPDIR); $(MAKE) clean
|
|
+# cd $(GMPDIR); $(MAKE) clean
|
|
# cd $(RSAREFSRCDIR); rm -f *.o *.a
|
|
- cd $(ZLIBDIR); $(MAKE) clean
|
|
+# cd $(ZLIBDIR); $(MAKE) clean
|
|
|
|
distclean: clean
|
|
-rm -f Makefile config.status config.cache config.log config.h
|
|
-rm -f ssh.1 sshd.8 make-ssh-known-hosts.1
|
|
- cd $(GMPDIR); $(MAKE) distclean
|
|
- cd $(ZLIBDIR); $(MAKE) distclean
|
|
+# cd $(GMPDIR); $(MAKE) distclean
|
|
+# cd $(ZLIBDIR); $(MAKE) distclean
|
|
|
|
dist: dist-free
|
|
|
|
@@ -709,12 +714,12 @@
|
|
-mkdir $(DISTNAME)
|
|
cp $(DISTFILES) $(DISTNAME)
|
|
for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
|
|
- (cd $(GMPDIR); make dist)
|
|
- gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
|
|
+# (cd $(GMPDIR); make dist)
|
|
+# gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
|
|
# tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
|
|
# cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
|
|
- (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
|
|
- cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
|
|
+# (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
|
|
+# cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
|
|
|
|
#ifdef F_SECURE_COMMERCIAL
|
|
#
|
|
@@ -742,7 +747,7 @@
|
|
(echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
|
|
|
|
depend:
|
|
- $(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS)
|
|
+ $(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS)
|
|
|
|
tags:
|
|
-rm -f TAGS
|