diff --git a/debian/rules b/debian/rules index 1e44d7bc..5d92b3bd 100755 --- a/debian/rules +++ b/debian/rules @@ -63,22 +63,12 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - # Apply our patches to Wine - for DIR in $$(find $(CURDIR)/patches/ -type d | sort); do \ - for FILE in $$(ls $$DIR | sort | grep '\.patch$$'); do \ - patch -N -p0 --strip=1 < $$DIR/$$FILE || exit 1; \ - done \ - done - - # Update the configure script - autoreconf + # Apply our patches, reconfigure, and update the wineserver protocol request data + make -C "$(CURDIR)/patches/" DESTDIR="$(CURDIR)" install # Configure CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/wine-compholio --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFFLAGS) - # Update the wineserver protocol request data - ./tools/make_requests - build: build-stamp build-stamp: config.status diff --git a/patches/Makefile b/patches/Makefile new file mode 100644 index 00000000..1b21b444 --- /dev/null +++ b/patches/Makefile @@ -0,0 +1,13 @@ +install: + # Apply our patches to Wine + for DIR in $$(find $(CURDIR) -type d | sort); do \ + for FILE in $$(ls $$DIR | sort | grep '\.patch$$'); do \ + patch -d $(DESTDIR) -N -p0 --strip=1 < $$DIR/$$FILE || exit 1; \ + done \ + done + + # Update the configure script + cd $(DESTDIR); autoreconf; + + # Update the wineserver protocol request data + cd $(DESTDIR); ./tools/make_requests;