65 lines
2.0 KiB
Plaintext
65 lines
2.0 KiB
Plaintext
--- builds/posix/make.defaults.orig 2022-06-07 08:18:52 UTC
|
|
+++ builds/posix/make.defaults
|
|
@@ -134,7 +134,7 @@ CAS_OPTIONS=@CAS_OPTIONS@
|
|
MATHLIB=@MATHLIB@
|
|
|
|
# switch to make sed edit files inplace
|
|
-INLINE_EDIT_SED:= -i
|
|
+INLINE_EDIT_SED:= -i ""
|
|
|
|
# Default programs and tools to be used in the build process
|
|
|
|
@@ -144,7 +144,7 @@ RM_R= rm -rf
|
|
CHMOD= chmod
|
|
CHMOD_6= chmod 666
|
|
CHMOD_7= chmod 777
|
|
-CHMOD_S7= chmod 06777
|
|
+CHMOD_S7= chmod 04555
|
|
MV= mv -f
|
|
TOUCH= touch
|
|
CP= cp
|
|
@@ -219,7 +219,7 @@ vpath %.dll $(LIB)
|
|
#LibraryFileName=libfbclient
|
|
LibraryFileName=libfbclient
|
|
LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
|
|
-LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.2
|
|
+LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.3
|
|
LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
|
|
|
|
LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName)
|
|
@@ -240,7 +240,7 @@ LIBFBINTL_SO = $(FB_BUILD)/intl/$(LIB_PREFIX)fbintl.$(
|
|
|
|
ifeq ($(EDITLINE_FLG),Y)
|
|
ifeq ($(STD_EDITLINE), true)
|
|
- LIBEDITLINE := -l$(READLINE)
|
|
+ LIBEDITLINE := $(shell pkgconf libedit --libs)
|
|
else
|
|
LIBEDITLINE := $(LIB)/libedit.a
|
|
endif
|
|
@@ -362,7 +362,7 @@ CREATE_DB = $(RBIN)/create_db$(EXEC_EXT)
|
|
GDS_DROP = $(BIN)/gds_drop$(EXEC_EXT)
|
|
FBSVCMGR = $(BIN)/fbsvcmgr$(EXEC_EXT)
|
|
FBTRACEMGR = $(BIN)/fbtracemgr$(EXEC_EXT)
|
|
-GSTAT = $(BIN)/gstat$(EXEC_EXT)
|
|
+GSTAT = $(BIN)/fbstat$(EXEC_EXT)
|
|
NBACKUP = $(BIN)/nbackup$(EXEC_EXT)
|
|
LOCKPRINT = $(BIN)/fb_lock_print$(EXEC_EXT)
|
|
GSEC = $(BIN)/gsec$(EXEC_EXT)
|
|
@@ -383,13 +383,13 @@ SECURITY_FDB = $(FIREBIRD)/security3.fdb
|
|
QLI = $(BIN)/qli$(EXEC_EXT)
|
|
|
|
# From isql
|
|
-ISQL = $(BIN)/isql$(EXEC_EXT)
|
|
-RUN_ISQL = $(RBIN)/isql$(EXEC_EXT)
|
|
+ISQL = $(BIN)/isql-fb$(EXEC_EXT)
|
|
+RUN_ISQL = $(RBIN)/isql-fb$(EXEC_EXT)
|
|
|
|
# From burp
|
|
GBAK = $(BIN)/gbak$(EXEC_EXT)
|
|
RUN_GBAK = $(RBIN)/gbak$(EXEC_EXT)
|
|
-GSPLIT = $(BIN)/gsplit$(EXEC_EXT)
|
|
+GSPLIT = $(BIN)/fbsplit$(EXEC_EXT)
|
|
|
|
# From gpre
|
|
# (gpre current is a link to one of the others)
|