Group :: System/Libraries
RPM: slang2
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: slang-2.3.2-alt-makefile.patch
Download
Download
diff -Nur slang-2.3.2.old/slsh/Makefile.in slang-2.3.2/slsh/Makefile.in
--- slang-2.3.2.old/slsh/Makefile.in 2018-03-05 03:16:36.000000000 +0400
+++ slang-2.3.2/slsh/Makefile.in 2018-08-17 16:19:55.316847361 +0400
@@ -87,15 +87,15 @@
OBJDIR_TSTAMP = $(OBJDIR)/tstamp
SOBJDIR_TSTAMP = $(SOBJDIR)/tstamp
#
-all: $(OBJDIR)/slsh_exe
+all: $(OBJDIR)/slsh_exe slsh
slsh: $(OBJDIR)/slsh
$(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
$(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
-$(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+$(OBJDIR)/slsh.o: slsh.c slsh.h config.h Makefile
cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
-$(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
+$(OBJDIR)/readline.o: readline.c slsh.h config.h Makefile
cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c
$(OBJDIR_TSTAMP):
-$(MKINSDIR) $(OBJDIR)
diff -Nur slang-2.3.2.old/src/Makefile.in slang-2.3.2/src/Makefile.in
--- slang-2.3.2.old/src/Makefile.in 2018-03-05 03:16:36.000000000 +0400
+++ slang-2.3.2/src/Makefile.in 2018-08-17 16:13:57.975826688 +0400
@@ -44,9 +44,13 @@
#---------------------------------------------------------------------------
prefix = @prefix@
exec_prefix = @exec_prefix@
-install_lib_dir = @libdir@
-install_bin_dir = @bindir@
-install_include_dir = @includedir@
+libdir = @libdir@
+bindir = @bindir@
+includedir = @includedir@
+install_lib_dir = $(libdir)
+install_bin_dir = $(bindir)
+install_include_dir = $(includedir)
+
install_doc_dir = $(prefix)/share/doc/slang/v@slang_major_version@
DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
@@ -152,14 +156,14 @@
static: $(OBJDIR_TSTAMP) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
elf: $(ELFDIR_TSTAMP) $(CONFIG_H) $(ELFDIR_ELF_LIB)
-$(OBJDIR_NORMAL_LIB): $(OBJDIR_TSTAMP) $(CONFIG_H) $(OBJS)
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
-$(RM) $(OBJDIR_NORMAL_LIB)
cd $(OBJDIR) && $(AR_CR) $(NORMAL_LIB) $(OFILES)
$(RANLIB) $(OBJDIR_NORMAL_LIB)
@echo ""
@echo $(NORMAL_LIB) created in $(OBJDIR)
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
-$(RM) $(ELFDIR_ELF_LIB)
cd $(ELFDIR) && $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \