Skip to content

Commit

Permalink
Support older make versions for discovering dirs
Browse files Browse the repository at this point in the history
Use $(wildcard) instead of a shell command using "!=". The latter syntax
was added eleven years ago, but there are still fairly recent
distributions that ship older versions of make. Also, using a dedicated
feature removes the need to work around non-matching patterns etc.

Fixes #543.
  • Loading branch information
chrullrich committed Aug 25, 2022
1 parent 54b86e3 commit 80e8775
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ DOCS = README.oracle_fdw
REGRESS = oracle_fdw oracle_gis oracle_import oracle_join

# try to find Instant Client installations installed in standard paths
FIND_INCLUDE != ls -d /usr/include/oracle/*/client64 /usr/include/oracle/*/client 2>/dev/null | tr -d \$
FIND_LIBDIRS != ls -d /usr/lib/oracle/*/client64/lib /usr/lib/oracle/*/client/lib 2>/dev/null | tr -d \$
FIND_INCLUDE := $(wildcard /usr/include/oracle/*/client64 /usr/include/oracle/*/client)
FIND_LIBDIRS := $(wildcard /usr/lib/oracle/*/client64/lib /usr/lib/oracle/*/client/lib)

FIND_CPPFLAGS = $(foreach DIR,$(FIND_INCLUDE),-I$(DIR))
FIND_LDFLAGS = $(foreach DIR,$(FIND_LIBDIRS),-L$(DIR))
Expand Down

0 comments on commit 80e8775

Please sign in to comment.