diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-03-26 11:30:27 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-03-26 12:00:03 +0000 |
| commit | 34ebe95889444111f4d09cc9d2c26afa89bcf980 (patch) | |
| tree | d36ed40ba8b9a2cffb023b130124bee3393bead1 | |
| parent | 46335e7dd8889952f2b39b962f3f8d7b2cd9759a (diff) | |
| download | zlib-34ebe95889444111f4d09cc9d2c26afa89bcf980.tar.gz | |
Revert "Fix a Makefile.in issue with invalid cp command on non-shared builds."
This reverts commit 00acb9d73ee5eab5f2f1e99d6185b3e4a676f366.
Upstream has a better fix for this in a new version, and we tend not to
build zlib statically any more, since anything that relies on a static
zlib, also tends to have the option to use the embedded copy.
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 05086af..5b15bd0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -167,8 +167,8 @@ install-libs: $(LIBS) -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi - test -z "$(STATICLIB)" || cp $(STATICLIB) $(DESTDIR)$(libdir) - test -z "$(SHAREDLIBV)" || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) + cp $(STATICLIB) $(DESTDIR)$(libdir) + cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ |