diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-03-06 23:36:14 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-03-06 23:36:14 +0000 |
| commit | 277bbca5167f7f5105569256becc0470cbe7c7f2 (patch) | |
| tree | e1190ad1bc112b141df039a5036054db69dec902 /dbd | |
| parent | f6faff4c607c24a6d718b4616531dcade3867c4f (diff) | |
| download | apr-277bbca5167f7f5105569256becc0470cbe7c7f2.tar.gz | |
NetWare build overhaul in order to compile on Linux.
Fix for crappy linker which cant deal with absolute unix
paths for import files.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1078631 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd')
| -rw-r--r-- | dbd/NWGNUdbdfreetds | 4 | ||||
| -rw-r--r-- | dbd/NWGNUdbdmysql | 4 | ||||
| -rw-r--r-- | dbd/NWGNUdbdpgsql | 6 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli2 | 4 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli3 | 4 |
5 files changed, 9 insertions, 13 deletions
diff --git a/dbd/NWGNUdbdfreetds b/dbd/NWGNUdbdfreetds index bc631ee83..393e380c5 100644 --- a/dbd/NWGNUdbdfreetds +++ b/dbd/NWGNUdbdfreetds @@ -60,11 +60,9 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) -ifdef LINK_STATIC XLFLAGS += \ -l $(FREETDSSDK)/lib \ $(EOLIST) -endif # # These values will be appended to the correct variables based on the value of @@ -244,7 +242,7 @@ FILES_nlm_Ximports = \ ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(FREETDS_IMP) \ + @$(notdir $(FREETDS_IMP)) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql index 6f63946d7..72bb414e2 100644 --- a/dbd/NWGNUdbdmysql +++ b/dbd/NWGNUdbdmysql @@ -64,11 +64,9 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) -ifdef LINK_STATIC XLFLAGS += \ -l $(MYSQLSDK)/lib \ $(EOLIST) -endif # # These values will be appended to the correct variables based on the value of @@ -248,7 +246,7 @@ FILES_nlm_Ximports = \ ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(MYSQL_IMP) \ + @$(notdir $(MYSQL_IMP)) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdpgsql b/dbd/NWGNUdbdpgsql index 4862237c0..f6848fa96 100644 --- a/dbd/NWGNUdbdpgsql +++ b/dbd/NWGNUdbdpgsql @@ -65,6 +65,10 @@ ifdef LINK_STATIC XLFLAGS += \ -l $(PGSQLSDK)/lib \ $(EOLIST) +else +XLFLAGS += \ + -l $(PGSQLSDK)/imp \ + $(EOLIST) endif # @@ -245,7 +249,7 @@ FILES_nlm_Ximports = \ ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(PGSQL_IMP) \ + @$(notdir $(PGSQL_IMP)) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdsqli2 b/dbd/NWGNUdbdsqli2 index 584f60ab5..c1f9cd1fa 100644 --- a/dbd/NWGNUdbdsqli2 +++ b/dbd/NWGNUdbdsqli2 @@ -60,11 +60,9 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) -ifdef LINK_STATIC XLFLAGS += \ -l $(SQLITE2SDK) \ $(EOLIST) -endif # # These values will be appended to the correct variables based on the value of @@ -244,7 +242,7 @@ FILES_nlm_Ximports = \ ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(SQLITE2_IMP) \ + @$(notdir $(SQLITE2_IMP)) \ $(EOLIST) endif diff --git a/dbd/NWGNUdbdsqli3 b/dbd/NWGNUdbdsqli3 index d5468bce3..ed52a2486 100644 --- a/dbd/NWGNUdbdsqli3 +++ b/dbd/NWGNUdbdsqli3 @@ -60,11 +60,9 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) -ifdef LINK_STATIC XLFLAGS += \ -l $(SQLITE3SDK) \ $(EOLIST) -endif # # These values will be appended to the correct variables based on the value of @@ -246,7 +244,7 @@ FILES_nlm_Ximports = \ ifneq ($(LINK_STATIC),1) FILES_nlm_Ximports += \ - @$(SQLITE3_IMP) \ + @$(notdir $(SQLITE3_IMP)) \ $(EOLIST) endif |