diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-21 10:51:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-21 10:51:43 +0000 |
| commit | 0b4a6ab6ba9eb00cbeee88bf7fed247784672d67 (patch) | |
| tree | 69d3e5cd75a94778a8f1cd173c5f1555ac4a3f3c /epm | |
| parent | 2ab08d32f2bf207af52a206759b4974f776b4502 (diff) | |
#i10000# setsolar environment fails with CPP
Diffstat (limited to 'epm')
| -rw-r--r-- | epm/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epm/makefile.mk b/epm/makefile.mk index 9e17e66418e4..869c32a1b7ee 100644 --- a/epm/makefile.mk +++ b/epm/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -48,7 +48,9 @@ PATCH_FILE_NAME=epm-3.7.patch CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--disable-fltk .IF "$(OS)"=="MACOSX" -CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LINKFLAGS)" +.IF "$(EXTRA_CFLAGS)"!="" +CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LINKFLAGS)" CPP="gcc -E $(EXTRA_CFLAGS)" +.ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF BUILD_ACTION=make OUT2BIN=epm epminstall mkepmlist |