diff --git a/configure.ac b/configure.ac index b1d53af..15149f1 100644 --- a/configure.ac +++ b/configure.ac @@ -724,8 +724,7 @@ if test "$app_cv_registry" == "yes"; then AC_DEFINE(HAVE_WIN_REGISTRY) fi -AC_SUBST(VERSION) -AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)") +AC_SUBST(MAJOR_VERSION,"$(echo $PACKAGE_VERSION | cut -d. -f1)") AC_SUBST(HOST_CC) AC_SUBST(EXEEXT) AC_SUBST(DLLPREFIX) diff --git a/pw3270.spec.in b/pw3270.spec.in index ef7dde1..3df50f2 100644 --- a/pw3270.spec.in +++ b/pw3270.spec.in @@ -226,13 +226,13 @@ from pw3270 application. Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation Requires: jpackage-utils -%description javadoc -API documentation for %{name}. +%description javadoc +API documentation for %{name}. Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ @@ -293,7 +293,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/@PACKAGE_NAME@ %{_libdir}/libpw3270.so.@MAJOR_VERSION@ -%{_libdir}/libpw3270.so.@VERSION@ +%{_libdir}/libpw3270.so.@PACKAGE_VERSION@ %{_datadir}/@PACKAGE_NAME@/colors.conf %{_datadir}/@PACKAGE_NAME@/ui/00default.xml @@ -305,7 +305,7 @@ rm -rf $RPM_BUILD_ROOT %files -n lib3270 %defattr(-,root,root) %{_libdir}/lib3270.so.@MAJOR_VERSION@ -%{_libdir}/lib3270.so.@VERSION@ +%{_libdir}/lib3270.so.@PACKAGE_VERSION@ %files -n lib3270-devel %defattr(-,root,root) @@ -341,7 +341,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?_ooRexx} %files -n %{name}-plugin-rexx %defattr(-,root,root) -%{_rexxlibdir}/librx3270.so.@VERSION@ +%{_rexxlibdir}/librx3270.so.@PACKAGE_VERSION@ %{_rexxlibdir}/librx3270.so %{_rexxclassdir}/rx3270.cls %{_libdir}/@PACKAGE_NAME@-plugins/rx3270.so diff --git a/src/include/plugin.mak.in b/src/include/plugin.mak.in index e59f34e..f167f09 100644 --- a/src/include/plugin.mak.in +++ b/src/include/plugin.mak.in @@ -65,7 +65,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ #---[ Rules ]------------------------------------------------------------------ -VERSION=@VERSION@ +VERSION=@PACKAGE_VERSION@ DLL_FLAGS=@DLL_FLAGS@ SYSDLL_FLAGS=@SYSDLL_FLAGS@ DLL_CFLAGS=@DLL_CFLAGS@ diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 89963df..8e5f283 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -27,6 +27,7 @@ # PACKAGE=@PACKAGE_NAME@ +PACKAGE_VERSION=@PACKAGE_VERSION@ DEBUG_CFLAGS=-DDEBUG=1 -g -Wall DEPENDS ?= *.h ../include/*.h ../include/lib3270/*.h Makefile @@ -116,26 +117,26 @@ Release: $(BINRLS)/lib3270@DLLEXT@ install: Release $(MKDIR) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) $(BINRLS)/lib3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir) - $(LN_S) lib3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/lib3270@DLLEXT@.@MAJOR_VERSION@ + $(INSTALL_PROGRAM) $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir) + $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/lib3270@DLLEXT@.@MAJOR_VERSION@ $(LN_S) lib3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/lib3270@DLLEXT@ Debug: $(BINDBG)/lib3270@DLLEXT@ -$(BINDBG)/lib3270@DLLEXT@: $(BINDBG)/lib3270@DLLEXT@.@VERSION@ +$(BINDBG)/lib3270@DLLEXT@: $(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION) @rm -f $@ - @cd $(BINDBG) && $(LN_S) lib3270@DLLEXT@.@VERSION@ lib3270@DLLEXT@ + @cd $(BINDBG) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@ -$(BINDBG)/lib3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) +$(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) -$(BINRLS)/lib3270@DLLEXT@: $(BINRLS)/lib3270@DLLEXT@.@VERSION@ +$(BINRLS)/lib3270@DLLEXT@: $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION) @rm -f $@ - @cd $(BINRLS) && $(LN_S) lib3270@DLLEXT@.@VERSION@ lib3270@DLLEXT@ + @cd $(BINRLS) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@ -$(BINRLS)/lib3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) +$(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index cbcf605..9edcb92 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -27,6 +27,7 @@ # PACKAGE_NAME=@PACKAGE_NAME@ +PACKAGE_VERSION=@PACKAGE_VERSION@ #---[ Paths ]------------------------------------------------------------------ @@ -109,8 +110,8 @@ install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png $(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir) $(MKDIR) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir) - $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@ + $(INSTALL_PROGRAM) $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir) + $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@ $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) @@ -130,11 +131,11 @@ $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@D @$(LD) @LDARCH@ @LDAPPFLAGS@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) @$(STRIP) $@ -$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ +$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) @rm -f $@ - @cd $(LIBRLS) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ + @cd $(LIBRLS) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ -$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) +$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) @@ -150,11 +151,11 @@ $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@D @$(MKDIR) `dirname $@` @$(LD) @LDARCH@ @DBGRPATH@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) -$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ +$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) @rm -f $@ - @cd $(LIBDBG) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ + @cd $(LIBDBG) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ -$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) +$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) -- libgit2 0.21.2