diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:34:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:46:38 +0100 |
| commit | 7c4f2ec8a795534164ee1923093b7d5be0126c55 (patch) | |
| tree | 08971f4c7375629393b6d9cdeb713006778334bf /epm | |
| parent | 8c9823d311fdf8092cc75873e4565325d204a658 (diff) | |
Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc. This removes
the need for the special extshl and EXTRPATH=LOADER. Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
Diffstat (limited to 'epm')
| -rw-r--r-- | epm/makefile.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epm/makefile.mk b/epm/makefile.mk index a33f6077b925..795c0d093acb 100644 --- a/epm/makefile.mk +++ b/epm/makefile.mk @@ -42,9 +42,13 @@ PATCH_FILES=epm-3.7.patch .IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO" +EXTRPATH = NONE + CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--disable-fltk .IF "$(OS)"=="MACOSX" +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) .IF "$(EXTRA_CFLAGS)"!="" CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LINKFLAGS)" CPP="gcc -E $(EXTRA_CFLAGS)" .ENDIF # "$(EXTRA_CFLAGS)"!="" |