Commit 8a1846c7 authored by Alastair McKinstry's avatar Alastair McKinstry

build fixes

parent 94f848c6
......@@ -11,11 +11,16 @@ AUTOGENERATED:= udpt
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) \
-fPIC
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) \
-I/usr/include/cairo \
-I/usr/include/freetype2 \
-I/usr/include/fontconfig
export SUPPLIBS=/usr
# Build MPI version
ifneq (,$(findstring mpi,$(DEB_BUILD_OPTIONS)))
COND_CC:= "CC=mpicc"
......@@ -23,8 +28,6 @@ else
COND_CC:=
endif
export SUPPLIBS=/usr
ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
WITH_HDF5:=-with-hdf5_include=/usr/include/hdf5/serial \
--with-hdf5_libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
......@@ -51,10 +54,10 @@ override_dh_auto_configure:
--with-geotiff --with-sdf \
--with-hdf4-include=/usr/include/hdf --with-hdf4-libdir=/usr/lib \
--with-gadap \
LIBS=' -lcairo -lfreetype'
LIBS='-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial -lcairo -lfreetype'
mkdir -p data doc
( cd data ; tar xapf ../../grads_2.2.0.orig-data.tar.xz )
( cd doc ; tar xapf ../../grads_2.2.0.orig-example.tar.xz )
( cd data ; tar xapf ../../grads_2.2.1.orig-data.tar.xz )
( cd doc ; tar xapf ../../grads_2.2.1.orig-example.tar.xz )
cp debian/favicon.png doc/favicon.png
override_dh_auto_install:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment