Skip to content

Commit c715ad7

Browse files
committed
Restore zconf.h to distribution.
1 parent ed16107 commit c715ad7

File tree

3 files changed

+551
-5
lines changed

3 files changed

+551
-5
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
*.gcno
1414
*.gcov
1515

16-
zconf.h
16+
/zconf.h
17+
/Makefile
1718
/example
1819
/example64
1920
/examplesh

Makefile.in

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,9 @@ zlib.3.pdf: $(SRCDIR)zlib.3
362362
# touch -r $(SRCDIR)zconf.h.in $@ &&\
363363
# rm $$TEMPFILE
364364
#
365-
# zconf: $(SRCDIR)zconf.h.in
366-
# cp -p $(SRCDIR)zconf.h.in zconf.h
365+
366+
zconf: $(SRCDIR)zconf.h.in
367+
cp -p $(SRCDIR)zconf.h.in zconf.h
367368

368369
minizip-test: static
369370
cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
@@ -384,8 +385,8 @@ clean: minizip-clean
384385
rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
385386

386387
maintainer-clean: distclean
387-
distclean: clean # zconf zconf.h.cmakein
388-
rm -f Makefile zlib.pc configure.log zconf.h
388+
distclean: clean zconf # zconf.h.cmakein
389+
rm -f Makefile zlib.pc configure.log
389390
-@rm -f .DS_Store
390391
@if [ -f Makefile.in ]; then \
391392
printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \

0 commit comments

Comments
 (0)