Changeset 43bcc5 in git for Makefile.in

Timestamp:

Nov 29, 1999, 2:18:14 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

21959cfde99e2b34993ef4bb1a03e6b58939bf78

Parents:

8016eb4a88ac332912ef0c53446f5b0b353e403b

Message:

* increased version number


git-svn-id: file:///usr/local/Singular/svn/trunk@3936 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Makefile.in (modified) (3 diffs)

Makefile.in

@@ -136 +136 @@
 LN_S            = @LN_S@
 MKINSTALLDIRS   = ./mkinstalldirs
+BINDIST_NAME    = Singular-${S_VERSION}-${SINGUNAME}
+SHAREDIST_NAME  = Singular-${S_VERSION}-share
 
 
@@ -152 +154 @@
         done
 
-install-local-dist: install-dist
-        ${MKINSTALLDIRS} ${localdir}/bin
-        ${LN_S} ${install_prefix}/${SINGUNAME}/Singular ${localdir}/bin/Singular-${S_VERSION}
-
-dist: sharedist bindist
-
-sharedist:
+dist: ${SHAREDIST_NAME}.tgz  ${BINDIST_NAME}.tgz 
+
+sharedist ${SHAREDIST_NAME}.tgz:
         if test -e ${TMPDIR}; then rm -rf ${TMPDIR}; fi
         ${MAKE} install-sharedist localdir=${TMPDIR}
-        cd ${TMPDIR}; tar czf Singular-${S_VERSION}-share.tgz Singular
-        mv ${TMPDIR}/Singular-${S_VERSION}-share.tgz .
-        rm -rf ${TMPDIR}
-
-bindist: 
+        cd ${TMPDIR}; tar czf ${SHAREDIST_NAME}.tgz Singular
+        mv ${TMPDIR}/${SHAREDIST_NAME}.tgz .
+        rm -rf ${TMPDIR}
+
+bindist ${BINDIST_NAME}.tgz: 
         if test -e ${TMPDIR}; then rm -fr ${TMPDIR}; fi
         ${MAKE} install-bindist localdir=${TMPDIR}
-        cd ${TMPDIR}; tar czf Singular-${S_VERSION}-${SINGUNAME}.tgz Singular
-        mv ${TMPDIR}/Singular-${S_VERSION}-${SINGUNAME}.tgz .
-        rm -rf ${TMPDIR}
+        cd ${TMPDIR}; tar czf ${BINDIST_NAME}.tgz  Singular
+        mv ${TMPDIR}/Singular-${S_VERSION}-${SINGUNAME}.tgz . .
+        rm -rf ${TMPDIR}
+
+install-local-dist: ${SHAREDIST_NAME}.tgz ${BINDIST_NAME}.tgz
+        cp ${SHAREDIST_NAME}.tgz ${BINDIST_NAME}.tgz ${localdir}
+        cd ${localdir}; tar xzf ${SHAREDIST_NAME}.tgz; tar xzf ${BINDIST_NAME}.tgz
+        rm -rf ${localdir}/${SHAREDIST_NAME}.tgz ${localdir}/${BINDIST_NAME}.tgz
+        ${MKINSTALLDIRS} ${localdir}/bin
+        ${LN_S} ${localdir}/Singular/${S_VERSION}/${SINGUNAME}/Singular ${localdir}/bin/Singular-${S_VERSION}
+        ${LN_S} ${localdir}/Singular/${S_VERSION}/${SINGUNAME}/ESingular ${localdir}/bin/ESingular-${S_VERSION}
+
+
 
 BINDIR_NAME     = Singular/${S_VERSION}/${SINGUNAME}
@@ -180 +188 @@
 EMACSDIR_NAME   = Singular/${S_VERSION}/emacs
 
-BINDIST_NAME    = Singular-${S_VERSION}-${SINGUNAME}
-SHAREDIST_NAME  = Singular-${S_VERSION}-share
 ZIP             = zip