2007-06-15 09:00:36 +00:00
|
|
|
--- slang-2.1.0/modules/Makefile.in.makefile 2007-05-28 23:02:29.000000000 +0200
|
|
|
|
|
+++ slang-2.1.0/modules/Makefile.in 2007-06-14 15:37:32.000000000 +0200
|
|
|
|
|
@@ -53,7 +53,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
|
|
|
|
|
MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
|
|
|
|
|
INSTALL = @INSTALL@
|
|
|
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
|
|
|
-INSTALL_MODULE = @INSTALL_MODULE@
|
|
|
|
|
+INSTALL_MODULE = @INSTALL@
|
|
|
|
|
MKINSDIR = ../autoconf/mkinsdir.sh
|
|
|
|
|
SLSH_DIR = $(prefix)/share/slsh
|
|
|
|
|
CMAPS_DIR = $(SLSH_DIR)/cmaps
|
|
|
|
|
@@ -67,7 +67,7 @@ DEST_SLSH_DIR = $(DESTDIR)$(SLSH_DIR)
|
|
|
|
|
DEST_CMAPSDIR = $(DESTDIR)$(CMAPS_DIR)
|
|
|
|
|
DEST_HELPDIR = $(DESTDIR)$(HELP_DIR)
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
-RPATH = @RPATH@
|
|
|
|
|
+RPATH =
|
|
|
|
|
|
|
|
|
|
LIBS = $(RPATH) $(SLANG_LIB) $(DL_LIB) -lm
|
|
|
|
|
#LIBS = $(RPATH) $(DL_LIB) -lm
|
|
|
|
|
--- slang-2.1.0/slsh/Makefile.in.makefile 2007-05-28 23:02:29.000000000 +0200
|
|
|
|
|
+++ slang-2.1.0/slsh/Makefile.in 2007-06-14 15:30:48.000000000 +0200
|
|
|
|
|
@@ -14,7 +14,7 @@ SLANG_SRCINC = -I@SRCDIR@
|
|
|
|
|
SLANG_SRCLIB = -L@OBJDIR@ -L@ELFDIR@
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ -lm
|
|
|
|
|
-RPATH = @RPATH@
|
|
|
|
|
+RPATH =
|
|
|
|
|
#----------------------------------------------------------------------------
|
|
|
|
|
INSTALL = @INSTALL@
|
|
|
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
|
|
|
@@ -61,7 +61,7 @@ DEST_SLSH_SCRIPT_DIR = $(DESTDIR)$(SLSH_
|
|
|
|
|
#----------------------------------------------------------------------------
|
|
|
|
|
@SET_MAKE@
|
|
|
|
|
SHELL = /bin/sh
|
|
|
|
|
-INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
|
|
|
|
|
+INST_LIBS = $(RPATH) $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
|
|
|
|
|
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
|
|
|
|
|
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
|
|
|
|
|
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
|
|
|
|
|
--- slang-2.1.0/src/Makefile.in.makefile 2007-05-28 23:02:29.000000000 +0200
|
|
|
|
|
+++ slang-2.1.0/src/Makefile.in 2007-06-14 15:13:30.000000000 +0200
|
|
|
|
|
@@ -184,10 +184,10 @@ install-elf: elf install-headers install
|
|
|
|
|
-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
|
|
|
|
|
-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
|
|
|
|
|
@echo installing $(ELFLIB_MAJOR_MINOR) in $(DEST_LIBDIR)
|
|
|
|
|
- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
|
|
|
|
|
+ $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)
|
|
|
|
|
@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
|
|
|
|
|
-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
|
|
|
|
|
- -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
|
|
|
|
|
+ -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
|
|
|
|
|
@echo ""
|
|
|
|
|
@echo $(ELFLIB_MAJOR_MINOR) created in $(DEST_LIBDIR).
|
|
|
|
|
@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) were also created.
|
2007-06-15 09:35:26 +00:00
|
|
|
--- slang-2.1.0/autoconf/Makefile.in.makefile 2007-05-28 23:02:29.000000000 +0200
|
|
|
|
|
+++ slang-2.1.0/autoconf/Makefile.in 2007-06-15 11:26:44.000000000 +0200
|
|
|
|
|
@@ -18,7 +18,6 @@ help:
|
|
|
|
|
@echo "make check : Build the library and run the regression tests"
|
|
|
|
|
static: Makefile
|
|
|
|
|
cd src; $(MAKE) static
|
|
|
|
|
- cd slsh; $(MAKE) all
|
|
|
|
|
elf: Makefile
|
|
|
|
|
cd src; $(MAKE) elf
|
|
|
|
|
cd slsh; $(MAKE) all
|
