From 471622b6b9892be5897d072d2c971540dc727c95 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Thu, 9 Nov 2017 17:42:56 +0000 Subject: [PATCH] init-project: Set package name a bit more directly Signed-off-by: Simon McVittie <smcv@collabora.com> --- data/capsule-init-project | 4 ++-- data/shim-configure.ac.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/capsule-init-project b/data/capsule-init-project index 41d489371..020f4b50b 100755 --- a/data/capsule-init-project +++ b/data/capsule-init-project @@ -196,7 +196,7 @@ sed \ -e "s,@LIB@,$escaped_lib," \ -e "s,@RUNTIME_TREE@,$escaped_runtime_tree," \ -e "s,@SEARCH_TREE@,$escaped_search_tree," \ - -e "s,@LCBASE@,$lcbase," \ + -e "s,@PACKAGE@,${lcbase}-proxy," \ -e "s,@VER@,$ver," \ < "$CAPSULE_MKINC/shim-configure.ac.in" \ > configure.ac; @@ -211,7 +211,7 @@ sed \ -e "s,@AMLIB@,$automake_lib," \ -e "s,@RUNTIME_TREE@,$escaped_runtime_tree," \ -e "s,@SEARCH_TREE@,$escaped_search_tree," \ - -e "s,@LCBASE@,$lcbase," \ + -e "s,@PACKAGE@,${lcbase}-proxy," \ -e "s,@VER@,$ver," \ < "$CAPSULE_MKINC/shim-Makefile.am" \ > Makefile.am; diff --git a/data/shim-configure.ac.in b/data/shim-configure.ac.in index 0861db023..e6b56dfa3 100644 --- a/data/shim-configure.ac.in +++ b/data/shim-configure.ac.in @@ -4,7 +4,7 @@ AC_PREREQ([2.60]) -AC_INIT([@LCBASE@-proxy], [@VER@]) +AC_INIT([@PACKAGE@], [@VER@]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -- GitLab