Commit 30c08f2e authored by Richard Levitte's avatar Richard Levitte
Browse files

Update the make system for installations: 

- define a HERE variable to indicate where the source tree is (used
  very little right now)
- make more use of copying and making attribute changes to {file}.new,
  and then move it to {file}
- use 'mv -f' to avoid all those questions to the user when the file
  in question doesn't have write attributes for that user.
parent 9f100cf3

Makefile.org

+11 −6
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ OPTIONS= 
CONFIGURE_ARGS=

SHLIB_TARGET=



# HERE indicates where this Makefile lives.  This can be used to indicate

# where sub-Makefiles are expected to be.  Currently has very limited usage,

# and should probably not be bothered with at all.

HERE=.



# INSTALL_PREFIX is for package builders so that they can configure

# for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.

# Normally it is left empty.
@@ -257,7 +262,7 @@ clean-shared: 


link-shared:

	@ for i in ${SHLIBDIRS}; do \

		$(NEWMAKE) -f Makefile.shared \

		$(NEWMAKE) -f $(HERE)/Makefile.shared \

			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \

			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \

			symlink.$(SHLIB_TARGET); \
@@ -496,7 +501,7 @@ install: all install_docs 
			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

			mv $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \

			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \

		fi; \

	done;

	@if [ -n "$(SHARED_LIBS)" ]; then \
@@ -508,21 +513,21 @@ install: all install_docs 
				if [ "$(PLATFORM)" != "Cygwin" ]; then \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

					mv $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \

				else \

					c=`echo $$i | sed 's/^lib/cyg/'`; \

					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					mv $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \

					cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \

					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \

					mv $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \

				fi ); \

			fi; \

		done; \

		(	here="`pwd`"; \

			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \

			$(NEWMAKE) -f $$here/Makefile link-shared ); \

			$(NEWMAKE) -f $$here/Makefile HERE="$$here" link-shared ); \

	fi

	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkginfo

apps/Makefile.ssl

+9 −6
Original line number Diff line number Diff line
@@ -99,17 +99,20 @@ install: 
	@for i in $(EXE); \

	do  \

	(echo installing $$i; \

	 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \

	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \

	 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \

	 done;

	@for i in $(SCRIPTS); \

	do  \

	(echo installing $$i; \

	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \

	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \

	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \

	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \

	 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/misc/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/misc/$$i ); \

	 done

	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \

	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf

	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \

	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \

	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf



tags:

	ctags $(SRC)

engines/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ install: 
			( echo installing $$l; \

			  cp lib$$l.so $(INSTALL_PREFIX)$(OPENSSLDIR)/engines/lib$$l.so.new; \

			  chmod 555 $(INSTALL_PREFIX)$(OPENSSLDIR)/engines/lib$$l.so.new; \

			  mv $(INSTALL_PREFIX)$(OPENSSLDIR)/engines/lib$$l.so.new $(INSTALL_PREFIX)$(OPENSSLDIR)/engines/lib$$l.so ); \

			  mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/engines/lib$$l.so.new $(INSTALL_PREFIX)$(OPENSSLDIR)/engines/lib$$l.so ); \

		done; \

	fi

tools/Makefile.ssl

+6 −4
Original line number Diff line number Diff line
@@ -27,13 +27,15 @@ all: 
install:

	@for i in $(APPS) ; \

	do  \

	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \

	chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \

	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \

	done;

	@for i in $(MISC_APPS) ; \

	do  \

	(cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \

	chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \

	(cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \

	chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \

	mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/misc/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/misc/$$i ); \

	done;



files: