Репозитории ALT
5.1: | 2.1.5-alt1 |
4.1: | 2.1.4-alt1 |
4.0: | 2.1.3-alt5.1 |
3.0: | 2.1.3-alt5 |
Группа :: Базы Данных
Пакет: sqsh
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: sqsh-2.1-makefile.patch
Скачать
Скачать
diff -ruN sqsh-2.1.orig/Makefile.in sqsh-2.1/Makefile.in
--- sqsh-2.1.orig/Makefile.in Wed Oct 24 08:00:30 2001
+++ sqsh-2.1/Makefile.in Tue Apr 2 01:31:15 2002
@@ -5,11 +5,12 @@
prefix = @prefix@
src_dir = @srcdir@
exec_prefix = @exec_prefix@
-bin_dir = $(exec_prefix)/bin
-inc_dir = $(prefix)/include
-lib_dir = $(exec_prefix)/lib
+sysconfdir = @sysconfdir@
+bin_dir = @bindir@
+inc_dir = @includedir@
+lib_dir = @libdir@
man_src = $(src_dir)/doc
-man_dir = $(prefix)/man
+man_dir = @mandir@
INSTALL = $(src_dir)/autoconf/install-sh
INSTALL_PROG = $(INSTALL) -c
@@ -17,7 +18,7 @@
INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_MAN = $(src_dir)/autoconf/install-man
-SQSHRC_GLOBAL = $(prefix)/etc/sqshrc
+SQSHRC_GLOBAL = $(sysconfdir)/sqshrc
MAN_PAGES = sqsh.1
SRCS = $(OBJS:.o=.c)
@@ -26,6 +27,8 @@
SUBDIRS = src
TARGET = sqsh
+DESTDIR =
+
build : build-subdirs
build-subdirs :
@@ -50,23 +53,23 @@
done
install : build-subdirs
- @$(INSTALL_DIR) $(bin_dir); \
- $(INSTALL_PROG) src/$(TARGET) $(bin_dir)/$(TARGET); \
- $(INSTALL_DIR) `dirname $(SQSHRC_GLOBAL)`; \
+ @$(INSTALL_DIR) $(DESTDIR)$(bin_dir); \
+ $(INSTALL_PROG) src/$(TARGET) $(DESTDIR)$(bin_dir)/$(TARGET); \
+ $(INSTALL_DIR) `dirname $(DESTDIR)$(SQSHRC_GLOBAL)`; \
if test -f $(SQSHRC_GLOBAL); then \
echo WARNING: You already have the file $(SQSHRC_GLOBAL); \
echo installed. This file will be left untouched. The version; \
echo supplied with this installation will be installed as; \
echo $(SQSHRC_GLOBAL).new; \
- $(INSTALL_DATA) doc/global.sqshrc $(SQSHRC_GLOBAL).new; \
+ $(INSTALL_DATA) doc/global.sqshrc $(DESTDIR)$(SQSHRC_GLOBAL).new; \
else \
- $(INSTALL_DATA) doc/global.sqshrc $(SQSHRC_GLOBAL); \
+ $(INSTALL_DATA) doc/global.sqshrc $(DESTDIR)$(SQSHRC_GLOBAL); \
fi
install-wrapper : install
- @mv $(bin_dir)/$(TARGET) $(bin_dir)/$(TARGET).bin; \
+ @mv $(DESTDIR)$(bin_dir)/$(TARGET) $(DESTDIR)$(bin_dir)/$(TARGET).bin; \
/bin/sh scripts/make_wrapper.sh scripts/wrapper.sh.in scripts/wrapper.sh; \
- $(INSTALL_PROG) scripts/wrapper.sh $(bin_dir)/$(TARGET)
+ $(INSTALL_PROG) scripts/wrapper.sh $(DESTDIR)$(bin_dir)/$(TARGET)
uninstall :
rm -f $(bin_dir)/$(TARGET) $(bin_dir)/$(TARGET).bin
@@ -74,13 +77,13 @@
uninstall-wrapper: uninstall
install.man :
- $(INSTALL_MAN) -s $(man_src) -d $(man_dir) $(MAN_PAGES)
+ $(INSTALL_MAN) -s $(man_src) -d $(DESTDIR)$(man_dir) $(MAN_PAGES)
uninstall.man :
$(INSTALL_MAN) -u -d $(man_dir) $(MAN_PAGES)
install.zman :
- $(INSTALL_MAN) -c -u -d $(man_dir) $(MAN_PAGES)
+ $(INSTALL_MAN) -c -u -d $(DESTDIR)$(man_dir) $(MAN_PAGES)
uninstall.zman :
$(INSTALL_MAN) -c -u -d $(man_dir) $(MAN_PAGES)
diff -ruN sqsh-2.1.orig/src/Makefile.in sqsh-2.1/src/Makefile.in
--- sqsh-2.1.orig/src/Makefile.in Wed Oct 24 07:31:06 2001
+++ sqsh-2.1/src/Makefile.in Tue Apr 2 01:32:17 2002
@@ -7,7 +7,7 @@
# common directory. If you don't want a global sqshrc just comment
# out SQSHRC_GLOBAL, below.
-SQSHRC_GLOBAL = @prefix@/etc/sqshrc
+SQSHRC_GLOBAL = @sysconfdir@/sqshrc
SQSHRC_PATH = "$(SQSHRC_GLOBAL):$${HOME}/.sqshrc"
# The following variables are configurable by the user. Typically