diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-04-08 13:27:08 +0100 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-04-08 13:33:39 +0100 |
| commit | b85893274f1d38720a2cdb58d8f5c71b0ed68ee7 (patch) | |
| tree | 16a07a09d56ff5a1b9abcf3339d6e730ad701ed3 | |
| parent | 1698ebb1f1152a1ab169d60013a8a94e2ead7bd2 (diff) | |
| download | nyancat-b85893274f1d38720a2cdb58d8f5c71b0ed68ee7.tar.gz | |
Refresh patch to reflect new upstream Makefile
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/patches/01-nyancat-make-install.patch | 70 |
2 files changed, 19 insertions, 53 deletions
@@ -33,6 +33,6 @@ distcheck: $(distdir).tar.gz @echo "*** Package $(distdir).tar.gz is ready for distribution." install: all - install src/nyancat /usr/bin/${package} + install -Dm 0755 src/nyancat $(DESTDIR)/usr/bin/${package} .PHONY: FORCE all clean check dist distcheck install diff --git a/debian/patches/01-nyancat-make-install.patch b/debian/patches/01-nyancat-make-install.patch index 00b6062..54c4a55 100644 --- a/debian/patches/01-nyancat-make-install.patch +++ b/debian/patches/01-nyancat-make-install.patch @@ -1,54 +1,20 @@ -diff --git a/Makefile b/Makefile -index 9ac517f..318bce4 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,35 +1,22 @@ -+prefix = /usr -+exec_prefix = ${prefix} -+ -+bindir = ${exec_prefix}/bin -+datarootdir = $(prefix)/share -+mandir = ${datarootdir}/man -+ - package = nyancat - version = 0.1 - tarname = $(package) - distdir = $(tarname)-$(version) +Description: Add $(DESTDIR) to install path + Required for debhelper dh_install + . + nyancat (0.1+git20120401.5a88b86-1) unstable; urgency=low + . + * Initial release (Closes: #661565) +Author: Jonathan McCrohan <jmccrohan@gmail.com> +Bug-Debian: http://bugs.debian.org/661565 + +--- +--- nyancat-0.1+git20120401.5a88b86.orig/Makefile ++++ nyancat-0.1+git20120401.5a88b86/Makefile +@@ -33,6 +33,6 @@ distcheck: $(distdir).tar.gz + @echo "*** Package $(distdir).tar.gz is ready for distribution." --all clean check nyancat: -- cd src && $(MAKE) $@ -- --dist: $(distdir).tar.gz -+SRCDIR = src -+INSTALL = /usr/bin/install -c + install: all +- install src/nyancat /usr/bin/${package} ++ install -Dm 0755 src/nyancat $(DESTDIR)/usr/bin/${package} --$(distdir).tar.gz: $(distdir) -- tar chof - $(distdir) | gzip -9 -c > $@ -- rm -rf $(distdir) -- --$(distdir): FORCE -- mkdir -p $(distdir)/src -- cp Makefile $(distdir) -- cp src/Makefile $(distdir)/src -- cp src/nyancat.c $(distdir)/src -- cp src/animation.h $(distdir)/src -- cp src/telnet.h $(distdir)/src -- --FORCE: -- -rm $(distdir).tar.gz >/dev/null 2>&1 -- -rm -rf $(distdir) >/dev/null 2>&1 -+all clean check nyancat: -+ cd $(SRCDIR) && $(MAKE) $@ - --distcheck: $(distdir).tar.gz -- gzip -cd $(distdir).tar.gz | tar xvf - -- cd $(distdir) && $(MAKE) all -- cd $(distdir) && $(MAKE) check -- cd $(distdir) && $(MAKE) clean -- rm -rf $(distdir) -- @echo "*** Package $(distdir).tar.gz is ready for distribution." -+install : -+ $(INSTALL) -Dm 0755 $(SRCDIR)/$(package) $(DESTDIR)$(bindir)/$(package) - --.PHONY: FORCE all clean check dist distcheck -+.PHONY: all clean check install + .PHONY: FORCE all clean check dist distcheck install |