From 4db610f842cbbf6c3c1593a524b004bfc780cbca Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 24 Dec 2018 23:01:10 -0500 Subject: Makefile.am: Drop "." from SHSOEXT and libopkbuild_shsoversion --- diff --git a/Makefile.am b/Makefile.am index e56044e..58d4842 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,17 +47,17 @@ SHPPFLAGS = \ -DSYSCONFDIR="$(sysconfdir)" \ -DHELPERDIR="$(helperdir)" \ -DOPKG="$(OPKG)" -SHSOEXT = .shso +SHSOEXT = shso LINK = printf "PACKAGE_VERSION='%s'\n" "$(PACKAGE_VERSION_GIT)" | \ '$(srcdir)/tools/shld.sh' -I '$(SH)' -o $@ config.sh - LIBLINK = '$(srcdir)/tools/shld.sh' -o $@ -libdata_DATA = lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion) +libdata_DATA = lib/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion) libopkbuild_sources = EXTRA_libopkbuild_sources = libopkbuild_ldadd = $(libopkbuild_sources:.sh=.sho) libopkbuild_dependencies = $(libopkbuild_ldadd) -libopkbuild_shsoversion = .1 +libopkbuild_shsoversion = 1 man1_MANS = $(man1_sources:.1in=.1) man3_MANS = $(man3_sources:.3in=.3) @@ -137,8 +137,9 @@ dist-hook: mv '$(distdir)/ChangeLog~' '$(distdir)/ChangeLog'; \ fi -lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion): $(libopkbuild_dependencies) - @rm -f lib/libopkbuild$(SHSOEXT)$(libopkbuild_shsoversion) +lib/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion): \ + $(libopkbuild_dependencies) + @rm -f lib/libopkbuild.$(SHSOEXT).$(libopkbuild_shsoversion) $(AM_V_CCLD)$(LIBLINK) $(libopkbuild_ldadd) .sh.sho: -- cgit v0.9.1