Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix configure and Makefile #756

Merged
merged 3 commits into from
Aug 6, 2023
Merged

Fix configure and Makefile #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2c1f19
Makefie.in: fix install location
vyzo Aug 6, 2023
24edfe8
enable zlib must be enabled by default or else the build fails
vyzo Aug 6, 2023
3fab295
Makefile.in: remove the linkdir madness
vyzo Aug 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,11 @@ mandir = @mandir@

LIBS = @LIBS@

gerbil_home = ${prefix}/lib/${PACKAGE_SHORTNAME}
gerbil_home = ${prefix}
gerbil_bin = "$(gerbil_home)/bin"
gerbil_lib = "${gerbil_home}/lib"
gerbil_share = "${gerbil_home}/share"


gerbil_bin_linkdir = "${prefix}/bin"
gerbil_share_linkdir = "${prefix}/share"

gerbil_make_conf = @gerbil_make_conf@

gerbil: configure
Expand All @@ -63,7 +59,6 @@ stdlib:
lang:
cd src && LDFLAGS="$(LIBS)" ./build.sh lang


r7rs-large:
cd src && LDFLAGS="$(LIBS)" ./build.sh r7rs-large

Expand All @@ -77,15 +72,11 @@ stage1:
cd src && LDFLAGS="$(LIBS)" ./build.sh stage1

layout:
cd src && LDFLAGS="$(LIBS)" ./build.sh layout
cd src && LDFLAGS="$(LIBS)" ./build.sh layout

tags:
cd src && LDFLAGS="$(LIBS)" ./build.sh tags

install:
mkdir -p ${gerbil_bin} ${gerbil_share} ${gerbil_bin_linkdir} ${gerbil_share_linkdir}
mkdir -p ${gerbil_bin} ${gerbil_lib} ${gerbil_share}
cd src && ./install
cp -a --link --remove-destination ${gerbil_bin}/* ${gerbil_bin_linkdir} || \
cp -a ${gerbil_bin}/* ${gerbil_bin_linkdir}
cp -a --link --remove-destination ${gerbil_share}/* ${gerbil_share_linkdir} || \
cp -a ${gerbil_share}/* ${gerbil_share_linkdir}
4 changes: 2 additions & 2 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,7 +1831,7 @@ if test ${enable_zlib+y}
then :
enableval=$enable_zlib; ENABLE_ZLIB=$enableval
else $as_nop
ENABLE_ZLIB=no
ENABLE_ZLIB=yes
fi


Expand Down Expand Up @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = "$(printf '\a')"
FS = ""

}
{
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ fi
AC_ARG_ENABLE(zlib,
AS_HELP_STRING([--disable-zlib], [build std/text/zlib libraries - requires zlib (default is --enable-zlib]),
ENABLE_ZLIB=$enableval,
ENABLE_ZLIB=no)
ENABLE_ZLIB=yes)

if test "$ENABLE_ZLIB" = yes; then
gerbil_make_conf="$gerbil_make_conf --enable-zlib"
Expand Down