diff -Nru astra-1.6/debian/changelog astra-1.6/debian/changelog --- astra-1.6/debian/changelog 2016-05-20 09:41:22.000000000 +0000 +++ astra-1.6/debian/changelog 2016-05-22 11:02:36.000000000 +0000 @@ -1,3 +1,9 @@ +astra (1.6-0ubuntu9) xenial; urgency=medium + + * Change last patch to honor @prefix@. + + -- Elvis Stansvik Sun, 22 May 2016 13:02:10 +0200 + astra (1.6-0ubuntu8) xenial; urgency=medium * Install C++ headers. diff -Nru astra-1.6/debian/patches/orexplore_11_471842d.diff astra-1.6/debian/patches/orexplore_11_471842d.diff --- astra-1.6/debian/patches/orexplore_11_471842d.diff 1970-01-01 00:00:00.000000000 +0000 +++ astra-1.6/debian/patches/orexplore_11_471842d.diff 2016-05-22 11:00:19.000000000 +0000 @@ -0,0 +1,19 @@ +Index: astra/build/linux/Makefile.in +=================================================================== +--- astra.orig/build/linux/Makefile.in ++++ astra/build/linux/Makefile.in +@@ -270,11 +270,12 @@ py: libastra.la + + python-root-install: libastra.la + ifeq ($(DESTDIR),) +- cd ../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py install ++ cd ../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py install \ ++ --prefix=@prefix@ + else + # DESTDIR specified, so pass --root=$(DESTDIR) + cd ../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py install \ +- --root=$(DESTDIR) ++ --prefix=@prefix@ --root=$(DESTDIR) + endif + endif + diff -Nru astra-1.6/debian/patches/orexplore_11_47d5571.diff astra-1.6/debian/patches/orexplore_11_47d5571.diff --- astra-1.6/debian/patches/orexplore_11_47d5571.diff 2016-05-19 20:28:16.000000000 +0000 +++ astra-1.6/debian/patches/orexplore_11_47d5571.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Index: astra/build/linux/Makefile.in -=================================================================== ---- astra.orig/build/linux/Makefile.in -+++ astra/build/linux/Makefile.in -@@ -270,11 +270,12 @@ py: libastra.la - - python-root-install: libastra.la - ifeq ($(DESTDIR),) -- cd ../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py install -+ cd ../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py install \ -+ --prefix=/usr - else - # DESTDIR specified, so pass --root=$(DESTDIR) - cd ../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py install \ -- --root=$(DESTDIR) -+ --prefix=/usr --root=$(DESTDIR) - endif - endif - diff -Nru astra-1.6/debian/patches/series astra-1.6/debian/patches/series --- astra-1.6/debian/patches/series 2016-05-20 12:15:53.000000000 +0000 +++ astra-1.6/debian/patches/series 2016-05-22 10:59:55.000000000 +0000 @@ -8,4 +8,4 @@ orexplore_08_2da20f8.diff orexplore_09_e363721.diff orexplore_10_680df78.diff -orexplore_11_47d5571.diff +orexplore_11_471842d.diff