From 1b2912fbc690845ce47211df320ffb16c1a24322 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 20 Mar 2012 17:01:27 -0400 Subject: [PATCH] move zgz/pit to pit --- .gitignore | 2 +- Makefile.PL | 12 ++++++------ {zgz/pit => pit}/suse-bzip2/LICENSE | 0 {zgz/pit => pit}/suse-bzip2/Makefile | 0 {zgz/pit => pit}/suse-bzip2/blocksort.c | 0 {zgz/pit => pit}/suse-bzip2/bzip2.c | 0 {zgz/pit => pit}/suse-bzip2/bzlib.c | 0 {zgz/pit => pit}/suse-bzip2/bzlib.h | 0 {zgz/pit => pit}/suse-bzip2/bzlib_private.h | 0 {zgz/pit => pit}/suse-bzip2/compress.c | 0 {zgz/pit => pit}/suse-bzip2/crctable.c | 0 {zgz/pit => pit}/suse-bzip2/decompress.c | 0 {zgz/pit => pit}/suse-bzip2/huffman.c | 0 {zgz/pit => pit}/suse-bzip2/randtable.c | 0 14 files changed, 7 insertions(+), 7 deletions(-) rename {zgz/pit => pit}/suse-bzip2/LICENSE (100%) rename {zgz/pit => pit}/suse-bzip2/Makefile (100%) rename {zgz/pit => pit}/suse-bzip2/blocksort.c (100%) rename {zgz/pit => pit}/suse-bzip2/bzip2.c (100%) rename {zgz/pit => pit}/suse-bzip2/bzlib.c (100%) rename {zgz/pit => pit}/suse-bzip2/bzlib.h (100%) rename {zgz/pit => pit}/suse-bzip2/bzlib_private.h (100%) rename {zgz/pit => pit}/suse-bzip2/compress.c (100%) rename {zgz/pit => pit}/suse-bzip2/crctable.c (100%) rename {zgz/pit => pit}/suse-bzip2/decompress.c (100%) rename {zgz/pit => pit}/suse-bzip2/huffman.c (100%) rename {zgz/pit => pit}/suse-bzip2/randtable.c (100%) diff --git a/.gitignore b/.gitignore index c0492f6..64850cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ *.1 zgz/zgz -zgz/pit/suse-bzip2/suse-bzip2 +pit/suse-bzip2/suse-bzip2 Makefile Makefile.old blib diff --git a/Makefile.PL b/Makefile.PL index fc8baf2..d11e396 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -19,14 +19,14 @@ extra_build: zgz/zgz pristine-tar.spec pod2man -c pristine-bz2 pristine-bz2 > pristine-bz2.1 pod2man -c pristine-xz pristine-xz > pristine-xz.1 pod2man -c zgz zgz/zgz.pod > zgz.1 - make -C zgz/pit/suse-bzip2 + make -C pit/suse-bzip2 ZGZ_SOURCES = zgz/zgz.c zgz/gzip/*.c zgz/old-bzip2/*.c zgz/zgz: $(ZGZ_SOURCES) gcc -Wall -O2 -o $@ $(ZGZ_SOURCES) -lz -DZGZ_LIB=\"$(ZGZ_LIB)\" -SUSE_BZIP2_SOURCES = zgz/pit/suse-bzip2/*.c -zgz/pit/suse-bzip2/suse-bzip2: $(SUSE_BZIP2_SOURCES) +SUSE_BZIP2_SOURCES = pit/suse-bzip2/*.c +pit/suse-bzip2/suse-bzip2: $(SUSE_BZIP2_SOURCES) gcc -Wall -O2 -o $@ $(SUSE_BZIP2_SOURCES) extra_install: @@ -35,12 +35,12 @@ extra_install: install pristine-tar pristine-gz pristine-bz2 pristine-xz zgz/zgz $(DESTDIR)/usr/bin install -m 0644 *.1 $(DESTDIR)/usr/share/man/man1 install -d $(DESTDIR)$(ZGZ_LIB)/suse-bzip2 - install zgz/pit/suse-bzip2/bzip2 $(DESTDIR)$(ZGZ_LIB)/suse-bzip2 - install zgz/pit/suse-bzip2/libbz2* $(DESTDIR)$(ZGZ_LIB)/suse-bzip2 + install pit/suse-bzip2/bzip2 $(DESTDIR)$(ZGZ_LIB)/suse-bzip2 + install pit/suse-bzip2/libbz2* $(DESTDIR)$(ZGZ_LIB)/suse-bzip2 extra_clean: pristine-tar.spec rm -f *.1 zgz/zgz - make clean -C zgz/pit/suse-bzip2 + make clean -C pit/suse-bzip2 pristine-tar.spec: sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'