From: stephan Date: Sat, 22 Feb 2025 00:01:30 +0000 (+0000) Subject: Fix installation rules for import lib in the autoconf bundle, broken by recent refact... X-Git-Tag: major-release~242^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3d72a5587ec1d0c4049b3e095d4c40d53d41134;p=thirdparty%2Fsqlite.git Fix installation rules for import lib in the autoconf bundle, broken by recent refactoring in this branch. FossilOrigin-Name: 95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d --- diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index ac9a7bd7eb..ea0c45a3a8 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -167,10 +167,8 @@ all: $(libsqlite3.LIB)-$(ENABLE_LIB_STATIC) # with the main copies rom /main.mk. # install-dll-out-implib: $(install-dir.lib) $(libsqlite3.DLL) - @if [ x != "x$(libsqlite3.out.implib)"; then \ - if [ -f "$(libsqlite3.out.implib)" ]; then \ - $(INSTALL) $(libsqlite3.out.implib) "$(install-dir.lib)"; \ - fi; \ + if [ x != "x$(libsqlite3.out.implib)" ] && [ -f "$(libsqlite3.out.implib)" ]; then \ + $(INSTALL) $(libsqlite3.out.implib) "$(install-dir.lib)"; \ fi install-dll-unix-generic: install-dll-out-implib diff --git a/manifest b/manifest index c1925de937..1add228687 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Rename\sconfigure-defined\sENABLE_SHARED/STATIC\smakefile\svars\sto\sENABLE_LIB_...\sso\sthat\sthey're\sconsistent\sbetween\sthe\scanonical\sand\sautoconf\sbuilds\s(baby\ssteps\stowards\sfurther\sconfigure\scode\sconsolidation). -D 2025-02-21T23:43:10.891 +C Fix\sinstallation\srules\sfor\simport\slib\sin\sthe\sautoconf\sbundle,\sbroken\sby\srecent\srefactoring\sin\sthis\sbranch. +D 2025-02-22T00:01:30.550 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531 F auto.def 3875d07903dde3aadf396ce008b7eee2fec3aa61843d745b4fb574ce3797b2ac F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac -F autoconf/Makefile.in 1683f910febd935d1c4f82de1fabfff4b821102896ddd594fcb7a9a655ab5e7b +F autoconf/Makefile.in d4bc4b3e0680c9f9cd8633279e597abb5f29fa58f29950e49dbf359e1c553720 F autoconf/Makefile.msc 1249e425a24859c7b3f17575275247df9eec3bddc0d1d7e73941f1abdbb95a92 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288 @@ -2210,8 +2210,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 701cc1aff423b87996134801abbbcd06d529bbf522c725837844b6aea406fb1c -R cfd59444de14c58c3b0cb91971c70398 +P a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8 +R 2e03e2a46eda75fb7824ca457ccfbcf4 U stephan -Z 2a8d0ab48d4f7aa807a9bebec4fae941 +Z e919d723d6d10d5de9ca8edf111b0dd8 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f5a4cf1f9c..8a03021ade 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a7647fd07792ef32697c7ba8ab6348593c2a5c4cedf673b155206da6aae799f8 +95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d