Группа :: Разработка/Tcl
Пакет: tcl-dp
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: tcl-dp-4.0b2-alt1-fix-configure.patch
Скачать
Скачать
diff --git a/unix/Makefile.in b/unix/Makefile.in
index e98ff27..7ee4afe 100755
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -177,8 +177,8 @@ $(OBJ_DIR)/dpEFilter.o: $(UNIX_DIR)/dpEFilter.c
#----------------------------------------------------------------------
$(OBJ_DIR):
- if [ ! -d objs ]; then \
- mkdir objs; \
+ if [ ! -d $(OBJ_DIR) ]; then \
+ mkdir -p $(OBJ_DIR); \
fi
# This is necessary for the email channel
@@ -190,7 +190,7 @@ clean:
pkgIndex.tcl confdefs.h
tests: $(DP_LIB_FILE)
- cd ../tests; @TCL_SRC_DIR@/unix/tclsh all
+ cd ../tests; @bindir@/tclsh all
install:
@echo You didn't read the README, did you?
@@ -195,7 +195,7 @@ tests: $(DP_LIB_FILE)
install:
@echo You didn't read the README, did you?
-Makefile: Makefile.in
+Makefile: $(UNIX_DIR)/Makefile.in
./config.status
distclean: clean
diff --git a/unix/configure b/unix/configure
index 897b710..3008b87 100755
--- a/unix/configure
+++ b/unix/configure
@@ -747,7 +747,7 @@ TCL_SRC_DIR=`cd $TCL_BIN_DIR; make topDirName`
#--------------------------------------------------------------------
# Find out the top level source directory of this package.
#--------------------------------------------------------------------
-SRC_DIR=`cd ..; pwd`
+SRC_DIR=`cd ${srcdir}/..; pwd`
#--------------------------------------------------------------------
@@ -756,7 +756,7 @@ SRC_DIR=`cd ..; pwd`
# Makefile.
#--------------------------------------------------------------------
-file=$TCL_BIN_DIR/tclConfig.sh
+eval file=$libdir/tclConfig.sh
. $file
CC=$TCL_CC
SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
@@ -786,8 +786,11 @@ UDP=\$\(UNIX_DIR\)/dpUnixUdp.c
fi
+####################################################
+# Evaliates folders
-
+eval bindir=$bindir
+eval libdir=$libdir
####################################################