diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-15 13:33:59 +0100 |
---|---|---|
committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-15 13:34:26 +0100 |
commit | 7f2f96330056e62fffc96690e077b89cd338dd10 (patch) | |
tree | 996a0d69972cbe9d96bb39bf58ba5c010e764eac /postgresql/makefile.mk | |
parent | add some comments (diff) | |
download | core-7f2f96330056e62fffc96690e077b89cd338dd10.tar.gz core-7f2f96330056e62fffc96690e077b89cd338dd10.zip |
postgresql: separate patch into upstream & libreoffice-specific parts
Diffstat (limited to 'postgresql/makefile.mk')
-rw-r--r-- | postgresql/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 8b57a0777441..e4e3969e01ac 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -39,7 +39,9 @@ TARGET=so_postgresql TARFILE_NAME=postgresql-9.1.1 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78 PATCH_FILES=\ - $(TARFILE_NAME).patch + postgresql-moz-ldap.patch \ + $(TARFILE_NAME)-libreoffice.patch \ + $(TARFILE_NAME)-autoreconf.patch .IF "$(SYSTEM_POSTGRESQL)" == "YES" @all: @@ -61,7 +63,7 @@ CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --wi .IF "$(WITH_LDAP)" == "YES" CONFIGURE_ACTION += --with-ldap .IF "$(WITH_OPENLDAP)" != "YES" -CONFIGURE_ACTION += --with-mozldap +CONFIGURE_ACTION += --with-includes='$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap' --with-mozldap .ENDIF .ENDIF BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib libpq-flags.mk |