Download as
Browse Code »

Commit 2b2386cbf6edffd26039190798fee2874bceb1b2

Authored by perry.werneck@gmail.com
1 parent 48a559f9
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Campo do configure não estava funcionando direito em windows

Showing 5 changed files with 28 additions and 27 deletions   Show diff stats
configure.ac
  Diff comments   View file @2b2386c
... ... @@ -724,8 +724,7 @@ if test "$app_cv_registry" == "yes"; then
724 724 AC_DEFINE(HAVE_WIN_REGISTRY)
725 725 fi
726 726  
727   -AC_SUBST(VERSION)
728   -AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")
  727 +AC_SUBST(MAJOR_VERSION,"$(echo $PACKAGE_VERSION | cut -d. -f1)")
729 728 AC_SUBST(HOST_CC)
730 729 AC_SUBST(EXEEXT)
731 730 AC_SUBST(DLLPREFIX)
... ...
pw3270.spec.in
  Diff comments   View file @2b2386c
... ... @@ -226,13 +226,13 @@ from pw3270 application.
226 226  
227 227 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
228 228  
229   -%package javadoc
230   -Summary: Javadoc for %{name}
231   -Group: Documentation
  229 +%package javadoc
  230 +Summary: Javadoc for %{name}
  231 +Group: Documentation
232 232 Requires: jpackage-utils
233 233  
234   -%description javadoc
235   -API documentation for %{name}.
  234 +%description javadoc
  235 +API documentation for %{name}.
236 236  
237 237 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
238 238  
... ... @@ -293,7 +293,7 @@ rm -rf $RPM_BUILD_ROOT
293 293  
294 294 %{_bindir}/@PACKAGE_NAME@
295 295 %{_libdir}/libpw3270.so.@MAJOR_VERSION@
296   -%{_libdir}/libpw3270.so.@VERSION@
  296 +%{_libdir}/libpw3270.so.@PACKAGE_VERSION@
297 297  
298 298 %{_datadir}/@PACKAGE_NAME@/colors.conf
299 299 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml
... ... @@ -305,7 +305,7 @@ rm -rf $RPM_BUILD_ROOT
305 305 %files -n lib3270
306 306 %defattr(-,root,root)
307 307 %{_libdir}/lib3270.so.@MAJOR_VERSION@
308   -%{_libdir}/lib3270.so.@VERSION@
  308 +%{_libdir}/lib3270.so.@PACKAGE_VERSION@
309 309  
310 310 %files -n lib3270-devel
311 311 %defattr(-,root,root)
... ... @@ -341,7 +341,7 @@ rm -rf $RPM_BUILD_ROOT
341 341 %if 0%{?_ooRexx}
342 342 %files -n %{name}-plugin-rexx
343 343 %defattr(-,root,root)
344   -%{_rexxlibdir}/librx3270.so.@VERSION@
  344 +%{_rexxlibdir}/librx3270.so.@PACKAGE_VERSION@
345 345 %{_rexxlibdir}/librx3270.so
346 346 %{_rexxclassdir}/rx3270.cls
347 347 %{_libdir}/@PACKAGE_NAME@-plugins/rx3270.so
... ...
src/include/plugin.mak.in
  Diff comments   View file @2b2386c
... ... @@ -65,7 +65,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
65 65 INSTALL_DATA=@INSTALL_DATA@
66 66  
67 67 #---[ Rules ]------------------------------------------------------------------
68   -VERSION=@VERSION@
  68 +VERSION=@PACKAGE_VERSION@
69 69 DLL_FLAGS=@DLL_FLAGS@
70 70 SYSDLL_FLAGS=@SYSDLL_FLAGS@
71 71 DLL_CFLAGS=@DLL_CFLAGS@
... ...
src/lib3270/Makefile.in
  Diff comments   View file @2b2386c
... ... @@ -27,6 +27,7 @@
27 27 #
28 28  
29 29 PACKAGE=@PACKAGE_NAME@
  30 +PACKAGE_VERSION=@PACKAGE_VERSION@
30 31  
31 32 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
32 33 DEPENDS ?= *.h ../include/*.h ../include/lib3270/*.h Makefile
... ... @@ -116,26 +117,26 @@ Release: $(BINRLS)/lib3270@DLLEXT@
116 117  
117 118 install: Release
118 119 $(MKDIR) $(DESTDIR)$(libdir)
119   - $(INSTALL_PROGRAM) $(BINRLS)/lib3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)
120   - $(LN_S) lib3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/lib3270@DLLEXT@.@MAJOR_VERSION@
  120 + $(INSTALL_PROGRAM) $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
  121 + $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/lib3270@DLLEXT@.@MAJOR_VERSION@
121 122 $(LN_S) lib3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/lib3270@DLLEXT@
122 123  
123 124 Debug: $(BINDBG)/lib3270@DLLEXT@
124 125  
125   -$(BINDBG)/lib3270@DLLEXT@: $(BINDBG)/lib3270@DLLEXT@.@VERSION@
  126 +$(BINDBG)/lib3270@DLLEXT@: $(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION)
126 127 @rm -f $@
127   - @cd $(BINDBG) && $(LN_S) lib3270@DLLEXT@.@VERSION@ lib3270@DLLEXT@
  128 + @cd $(BINDBG) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@
128 129  
129   -$(BINDBG)/lib3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
  130 +$(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
130 131 @echo " CCLD `basename $@`"
131 132 @$(MKDIR) `dirname $@`
132 133 @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS)
133 134  
134   -$(BINRLS)/lib3270@DLLEXT@: $(BINRLS)/lib3270@DLLEXT@.@VERSION@
  135 +$(BINRLS)/lib3270@DLLEXT@: $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION)
135 136 @rm -f $@
136   - @cd $(BINRLS) && $(LN_S) lib3270@DLLEXT@.@VERSION@ lib3270@DLLEXT@
  137 + @cd $(BINRLS) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@
137 138  
138   -$(BINRLS)/lib3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@)
  139 +$(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@)
139 140 @echo " CCLD `basename $@`"
140 141 @$(MKDIR) `dirname $@`
141 142 @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS)
... ...
src/pw3270/Makefile.in
  Diff comments   View file @2b2386c
... ... @@ -27,6 +27,7 @@
27 27 #
28 28  
29 29 PACKAGE_NAME=@PACKAGE_NAME@
  30 +PACKAGE_VERSION=@PACKAGE_VERSION@
30 31  
31 32 #---[ Paths ]------------------------------------------------------------------
32 33  
... ... @@ -109,8 +110,8 @@ install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png
109 110 $(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir)
110 111  
111 112 $(MKDIR) $(DESTDIR)$(libdir)
112   - $(INSTALL_PROGRAM) $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)
113   - $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@
  113 + $(INSTALL_PROGRAM) $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
  114 + $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@
114 115 $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@
115 116  
116 117 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
... ... @@ -130,11 +131,11 @@ $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@D
130 131 @$(LD) @LDARCH@ @LDAPPFLAGS@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME)
131 132 @$(STRIP) $@
132 133  
133   -$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@
  134 +$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION)
134 135 @rm -f $@
135   - @cd $(LIBRLS) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@
  136 + @cd $(LIBRLS) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@
136 137  
137   -$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT))
  138 +$(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT))
138 139 @echo " CCLD `basename $@`"
139 140 @$(MKDIR) `dirname $@`
140 141 @$(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
150 151 @$(MKDIR) `dirname $@`
151 152 @$(LD) @LDARCH@ @DBGRPATH@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME)
152 153  
153   -$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@
  154 +$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION)
154 155 @rm -f $@
155   - @cd $(LIBDBG) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@
  156 + @cd $(LIBDBG) && $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@
156 157  
157   -$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT))
  158 +$(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.$(PACKAGE_VERSION): $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT))
158 159 @echo " CCLD `basename $@`"
159 160 @$(MKDIR) `dirname $@`
160 161 @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS)
... ...