From c96163a74bc964af20e566842e044f633dde3841 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sun, 11 Jan 2004 12:35:48 +0000 Subject: [PATCH] getting rid of Makefile.am in debian/ - it seems to be non-standard and is a pita to maintain anyway. instead, make distdir and distclean depend on a partial debian-clean. --- Makefile.am | 18 ++++++++++++++---- debian/Makefile.am | 5 ----- 2 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 debian/Makefile.am diff --git a/Makefile.am b/Makefile.am index 6204e22..fe3ffe1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,26 @@ -SUBDIRS = debian src +SUBDIRS = src man_MANS = isync.1 -EXTRA_DIST = isyncrc.sample isync.spec $(man_MANS) -DISTCLEANFILES = *~ build-stamp configure-stamp +EXTRA_DIST = debian isyncrc.sample isync.spec $(man_MANS) log: @echo "me:'Michael Elkins '" > .usermap @echo "melkins:'Michael Elkins '" >> .usermap + @echo "nboullis:'Nicolas Boullis '" >> .usermap @echo "ossi:'Oswald Buddenhagen '" >> .usermap + @echo "tytso:'Theodore Ts'o '" >> .usermap cvs2cl -U .usermap --no-wrap --separate-header @rm -f .usermap ChangeLog.bak +deb: + CFLAGS="-O2 -mcpu=i686" fakeroot debian/rules binary + +deb-clean: + dh_clean -Xsrc/ + fakeroot debian/rules unpatch + +distdir distclean: deb-clean + rpm: make dist cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/rpm/SOURCES - rpm -ba --target=i586 --clean isync.spec + rpm -ba --clean isync.spec diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index 1d3fb1c..0000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = changelog compat control copyright dirs docs rules -DISTCLEANFILES = files isync.substvars - -distclean-local: - rm -rf isync