[Libreoffice-commits] online.git: configure.ac loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json.in

[Jan Holesovsky]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06c978f0ef51ba39834ffaf00c9b525a7f1877ce
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri May 18 15:48:19 2018 +0200

    Don't confuse git wwhen the npm-shrinkwrap.json auto-updates.
    
    Change-Id: I84e4d2b57b2b8db76935e33c28b2e99129b281c6

diff --git a/configure.ac b/configure.ac
index 13204904c..421fdd686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,12 +448,12 @@ AC_SUBST(ENABLE_SETCAP)
 AC_CONFIG_LINKS([discovery.xml:discovery.xml])
 AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu])
 AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json])
-AC_CONFIG_LINKS([loleaflet/npm-shrinkwrap.json:loleaflet/npm-shrinkwrap.json])
 AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap])
 
 AC_CONFIG_FILES([Makefile
                  test/Makefile
                  loleaflet/Makefile
+                 loleaflet/npm-shrinkwrap.json
                  loolwsd.spec
                  loolwsd.xml
                  debian/loolwsd.postinst])
diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json.in
similarity index 100%
rename from loleaflet/npm-shrinkwrap.json
rename to loleaflet/npm-shrinkwrap.json.in