|
 |
d4d13f |
diff -ru slang-2.3.2.orig/configure slang-2.3.2/configure
|
|
|
d4d13f |
--- slang-2.3.2.orig/configure 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/configure 2020-09-15 12:16:06.735950835 +0200
|
|
|
d4d13f |
@@ -7082,8 +7082,8 @@
|
|
|
d4d13f |
fi
|
|
|
d4d13f |
fi
|
|
|
d4d13f |
|
|
|
d4d13f |
-OBJDIR=$SRCDIR/"\$(ARCH)"objs
|
|
|
d4d13f |
-ELFDIR=$SRCDIR/"\$(ARCH)"elfobjs
|
|
|
d4d13f |
+OBJDIR=$SRCDIR/objs
|
|
|
d4d13f |
+ELFDIR=$SRCDIR/elfobjs
|
|
|
d4d13f |
|
|
|
d4d13f |
|
|
|
d4d13f |
missingmodules=""
|
|
|
d4d13f |
diff -ru slang-2.3.2.orig/demo/Makefile.in slang-2.3.2/demo/Makefile.in
|
|
|
d4d13f |
--- slang-2.3.2.orig/demo/Makefile.in 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/demo/Makefile.in 2020-09-15 12:13:09.195956393 +0200
|
|
|
d4d13f |
@@ -10,7 +10,7 @@
|
|
|
d4d13f |
# Directory where the various libraries are located.
|
|
|
d4d13f |
#-----------------------------------------------------------------------------
|
|
|
d4d13f |
SLANG_INCLUDE = ../src# location of slang.h
|
|
|
d4d13f |
-SLANG_LIB = $(SLANG_INCLUDE)/$(ARCH)objs# location of libslang.a
|
|
|
d4d13f |
+SLANG_LIB = $(SLANG_INCLUDE)/objs# location of libslang.a
|
|
|
d4d13f |
|
|
|
d4d13f |
#---------------------------------------------------------------------------
|
|
|
d4d13f |
# Other libraries
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
diff -ru slang-2.3.2.orig/modules/Makefile.in slang-2.3.2/modules/Makefile.in
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
--- slang-2.3.2.orig/modules/Makefile.in 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/modules/Makefile.in 2020-09-15 12:19:04.808713632 +0200
|
|
|
d4d13f |
@@ -16,14 +16,14 @@
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
# ---------------------------------------------------------------------------
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
CC = @CC@
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
-LDFLAGS = @LDFLAGS@
|
|
|
d4d13f |
+LDFLAGS = @LDFLAGS@ -L../../src/elfobjs -lslang
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
CC_SHARED_FLAGS = @CC_SHARED_FLAGS@
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
CC_SHARED = $(CC) $(INCS) $(CC_SHARED_FLAGS) $(CFLAGS)
|
|
Lucio Andrés Illanes Albornoz |
099ee0 |
CONFIG_DIR = @CONFIG_DIR@
|
|
|
d4d13f |
SRCDIR = $(CONFIG_DIR)/modules
|
|
|
d4d13f |
CONFIG_H = $(SRCDIR)/config.h
|
|
|
d4d13f |
SLINT_H = $(SRCDIR)/slint.h
|
|
|
d4d13f |
-OBJDIR = $(ARCH)objs
|
|
|
d4d13f |
+OBJDIR = objs
|
|
|
d4d13f |
OBJDIR_TSTAMP = $(OBJDIR)/tstamp
|
|
|
d4d13f |
# ---------------------------------------------------------------------------
|
|
|
d4d13f |
# Installation location of the slang library
|
|
|
d4d13f |
diff -ru slang-2.3.2.orig/slsh/Makefile.in slang-2.3.2/slsh/Makefile.in
|
|
|
d4d13f |
--- slang-2.3.2.orig/slsh/Makefile.in 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/slsh/Makefile.in 2020-09-15 12:19:42.948712438 +0200
|
|
|
d4d13f |
@@ -4,7 +4,7 @@
|
|
|
d4d13f |
LDFLAGS = @LDFLAGS@
|
|
|
d4d13f |
DLINK_FLAGS = @DYNAMIC_LINK_FLAGS@
|
|
|
d4d13f |
CONFIG_DIR = @CONFIG_DIR@
|
|
|
d4d13f |
-OBJDIR = $(ARCH)objs
|
|
|
d4d13f |
+OBJDIR = objs
|
|
|
d4d13f |
SOBJDIR = static_objs
|
|
|
d4d13f |
SRCDIR = $(CONFIG_DIR)/slsh
|
|
|
d4d13f |
#---------------------------------------------------------------------------
|
|
|
d4d13f |
@@ -15,7 +15,6 @@
|
|
Jack Duvall |
35039d |
datarootdir = @datarootdir@
|
|
Jack Duvall |
35039d |
INST_LIB_DIR = @libdir@
|
|
Jack Duvall |
35039d |
SLANG_INST_INC = -I@includedir@
|
|
Jack Duvall |
35039d |
-SLANG_INST_LIB = -L$(INST_LIB_DIR)
|
|
Jack Duvall |
35039d |
#---------------------------------------------------------------------------
|
|
Jack Duvall |
35039d |
SLANG_SRCINC = -I@SRCDIR@
|
|
Jack Duvall |
35039d |
SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked
|
|
|
d4d13f |
diff -ru slang-2.3.2.orig/src/curses/Makefile slang-2.3.2/src/curses/Makefile
|
|
|
d4d13f |
--- slang-2.3.2.orig/src/curses/Makefile 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/src/curses/Makefile 2020-09-15 12:14:23.903954054 +0200
|
|
|
d4d13f |
@@ -1,5 +1,5 @@
|
|
|
d4d13f |
COMPILE = $(CC) $(CFLAGS) -g -DSLANG -I..
|
|
|
d4d13f |
-LFLAGS = -L../$(ARCH)objs -lslang
|
|
|
d4d13f |
+LFLAGS = -L../objs -lslang
|
|
|
d4d13f |
M_LIB = -lm
|
|
|
d4d13f |
|
|
|
d4d13f |
CURSES_H = ../curses.h
|
|
|
d4d13f |
diff -ru slang-2.3.2.orig/src/Makefile.in slang-2.3.2/src/Makefile.in
|
|
|
d4d13f |
--- slang-2.3.2.orig/src/Makefile.in 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/src/Makefile.in 2020-09-15 12:13:33.371955636 +0200
|
|
|
d4d13f |
@@ -244,7 +244,7 @@
|
|
|
d4d13f |
# The symlinks target is for my own private use. It simply creates the object
|
|
|
d4d13f |
# directory as a symbolic link to a local disk instead of an NFS mounted one.
|
|
|
d4d13f |
symlinks:
|
|
|
d4d13f |
- -/bin/rm -f $(ARCH)objs
|
|
|
d4d13f |
+ -/bin/rm -f objs
|
|
|
d4d13f |
mkdir -p $(HOME)/sys/$(ARCH)/objs/slang/src
|
|
|
d4d13f |
ln -s $(HOME)/sys/$(ARCH)/objs/slang/src $(ARCH)objs
|
|
|
d4d13f |
@echo "Also try: make elfsymlinks"
|
|
|
d4d13f |
diff -ru slang-2.3.2.orig/src/test/Makefile slang-2.3.2/src/test/Makefile
|
|
|
d4d13f |
--- slang-2.3.2.orig/src/test/Makefile 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/src/test/Makefile 2020-09-15 12:14:49.723953246 +0200
|
|
|
d4d13f |
@@ -13,7 +13,7 @@
|
|
|
d4d13f |
MEMCHECK = valgrind --tool=memcheck --leak-check=yes --leak-resolution=med --num-callers=20
|
|
|
d4d13f |
RUN_TEST_PGM = ./$(TEST_PGM)
|
|
|
d4d13f |
SLANGINC = ..
|
|
|
d4d13f |
-SLANGLIB = ../$(ARCH)objs
|
|
|
d4d13f |
+SLANGLIB = ../objs
|
|
|
d4d13f |
OTHER_LIBS = -lm
|
|
|
d4d13f |
OTHER_CFLAGS =
|
|
|
d4d13f |
|
|
|
d4d13f |
diff -ru slang-2.3.2.orig/src/util/Makefile slang-2.3.2/src/util/Makefile
|
|
|
d4d13f |
--- slang-2.3.2.orig/src/util/Makefile 2018-03-05 00:16:36.000000000 +0100
|
|
|
d4d13f |
+++ slang-2.3.2/src/util/Makefile 2020-09-15 12:15:07.135952701 +0200
|
|
|
d4d13f |
@@ -1,7 +1,7 @@
|
|
|
d4d13f |
INCS = -I..
|
|
|
d4d13f |
-LIBS = -L../$(ARCH)objs -lslang -lm
|
|
|
d4d13f |
+LIBS = -L../objs -lslang -lm
|
|
|
d4d13f |
|
|
|
d4d13f |
-bcdump: bcdump.c ../$(ARCH)objs/libslang.a
|
|
|
d4d13f |
+bcdump: bcdump.c ../objs/libslang.a
|
|
|
d4d13f |
$(CC) $(CFLAGS) $(INCS) bcdump.c -o bcdump $(LIBS)
|
|
|
d4d13f |
clean:
|
|
|
d4d13f |
/bin/rm -f *.o bcdump
|