pyrox.dev
1--- a/platforms/unix/config/Makefile.install
2+++ b/platforms/unix/config/Makefile.install
3@@ -101,10 +101,10 @@ uninstall-image : getversion
4
5 install-sources :
6 $(MKINSTALLDIRS) $(ROOT)$(imgdir)
7- $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(ROOT)$(imgdir)
8+ $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_SRC_VERSION).sources $(ROOT)$(imgdir)
9
10 uninstall-sources :
11- @$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources
12+ @$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_SRC_VERSION).sources
13
14 # npsqueak
15
16--- a/platforms/unix/config/configure.ac
17+++ b/platforms/unix/config/configure.ac
18@@ -122,7 +122,7 @@ AC_SUBST(vmpdir)
19 AC_SUBST(vmmcfg)
20 AC_SUBST(blddir)
21
22-SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}
23+AS_VAR_SET_IF([SQ_VERSION], [], [SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}])
24
25 AC_DEFINE_UNQUOTED(SQ_VERSION, "${SQ_VERSION}", [Squeak version])
26
27@@ -131,21 +131,24 @@ AC_SUBST(SQ_MINOR)
28 AC_SUBST(SQ_UPDATE)
29 AC_SUBST(SQ_VERSION)
30
31+AS_VAR_SET_IF([SQ_SRC_VERSION], [], [SQ_SRC_VERSION=${SQ_MAJOR}])
32+AC_SUBST(SQ_SRC_VERSION)
33+
34 #VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE}
35
36 #AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}", [VM version])
37
38-#AC_SUBST(VM_MAJOR)
39-#AC_SUBST(VM_MINOR)
40-#AC_SUBST(VM_RELEASE)
41-#AC_SUBST(VM_VERSION)
42+AC_SUBST(VM_MAJOR)
43+AC_SUBST(VM_MINOR)
44+AC_SUBST(VM_RELEASE)
45+AC_SUBST(VM_VERSION)
46
47 # libdir contains ${exec_prefix}, so we have to default and expand early
48 test "x$prefix" = xNONE && prefix=$ac_default_prefix
49 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
50 imgdir=`eval echo ${libdir}/squeak`
51 expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}`
52-plgdir='${imgdir}/`${blddir}/getversion VERSION_TAG`'
53+plgdir=`eval echo '${imgdir}'/${VM_VERSION}`
54
55 AC_SUBST(imgdir)
56 AC_SUBST(expanded_relative_imgdir)
57--- a/platforms/unix/config/inisqueak.in
58+++ b/platforms/unix/config/inisqueak.in
59@@ -32,6 +32,7 @@
60
61 MAJOR=@SQ_MAJOR@
62 VERSION=@SQ_VERSION@
63+SRC_VERSION=@SQ_SRC_VERSION@
64
65 prefix=@prefix@
66 exec_prefix=@exec_prefix@
67@@ -77,7 +78,7 @@ if test "$1" != ""; then
68 fi
69
70 SQUEAK=${bindir}/squeak
71-SOURCES=SqueakV${MAJOR}.sources
72+SOURCES=SqueakV${SRC_VERSION}.sources
73 IMAGE=squeak.image.gz
74 CHANGES=squeak.changes.gz
75
76--- a/platforms/unix/config/make.cfg.in
77+++ b/platforms/unix/config/make.cfg.in
78@@ -96,6 +96,16 @@ X_INCLUDES= @X_INCLUDES@
79 X_LIBS= @X_LIBS@
80
81
82+SQ_MAJOR= @SQ_MAJOR@
83+SQ_MINOR= @SQ_MINOR@
84+SQ_UPDATE= @SQ_UPDATE@
85+SQ_VERSION= @SQ_VERSION@
86+SQ_SRC_VERSION= @SQ_SRC_VERSION@
87+VM_MAJOR= @VM_MAJOR@
88+VM_MINOR= @VM_MINOR@
89+VM_RELEASE= @VM_RELEASE@
90+VM_VERSION= @VM_VERSION@
91+
92 INTERP= @INTERP@
93
94 VM_APP_ICONS= @VM_APP_ICONS@