diff --git a/Makefile.in b/Makefile.in index e219a62..e5cc01b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -133,13 +133,10 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE #---[ Release targets ]-------------------------------------------------------- -all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \ - $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \ - locale pixmaps filelist +all: Release -Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \ - $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \ - locale pixmaps +Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \ + locale pixmaps filelist $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) @@ -193,12 +190,6 @@ ifneq ($(RPMBUILD),no) @rm -fr $(PWD)/$(TMPDIR)/rpmbuild endif -deb: clean -ifneq ($(DPKGBUILD),no) - $(DPKGBUILD) -rfakeroot -uc -us -endif - - srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 ifneq ($(RPMBUILD),no) @$(RPMBUILD) --define="_srcrpmdir $(PWD)" -bs $(PACKAGE_TARNAME).spec @@ -263,12 +254,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist install: install-sdk install-lib install-app install-man install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale - @$(MAKE) DESTDIR=$(DESTDIR) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install + @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui install-lib: $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ - @$(MAKE) DESTDIR=$(DESTDIR) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install + @$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) @@ -307,7 +298,6 @@ clean: @rm -f $(PACKAGE_NAME).png @rm -f $(PACKAGE_NAME)-logo.png @rm -f *.log - @rm -fr debian @echo "$@" cleanDebug: clean diff --git a/debian.rules b/debian.rules index 9d1df03..cbe1707 100644 --- a/debian.rules +++ b/debian.rules @@ -22,8 +22,7 @@ build-stamp: # Add here commands to compile the package. ./configure --prefix=/usr rm -f debian/*.install - make filelist - make all + make Release # --- end custom part for compiling touch build-stamp @@ -34,7 +33,7 @@ clean: rm -f build-stamp # Add here commands to clean up after the build process. - make clean || true + if [ -e Makefile ]; then make clean; fi # --- end custom part for cleaning up dh_clean @@ -46,9 +45,11 @@ install: build dh_installdirs # Add here commands to install the packages - make DESTDIR=/usr/src/packages/BUILD/debian/lib3270 install-lib - make DESTDIR=/usr/src/packages/BUILD/debian/lib3270-dev install-sdk - make DESTDIR=/usr/src/packages/BUILD/debian/pw3270 install-app + make DESTDIR=$(PWD)/debian/lib3270 install-lib + make DESTDIR=$(PWD)/debian/lib3270-dev install-sdk + make DESTDIR=$(PWD)/debian/pw3270 install-app + + find debian # --- end custom part for installing # Build architecture-independent files here. @@ -80,7 +81,7 @@ binary-arch: build install # dh_makeshlibs dh_installdeb # dh_perl - dh_shlibdeps +# dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb diff --git a/makedeb.sh b/makedeb.sh index 7704920..4451976 100755 --- a/makedeb.sh +++ b/makedeb.sh @@ -11,6 +11,7 @@ mkdir debian echo 7 > debian/compat cp debian.control debian/control cp debian.rules debian/rules +chmod +x debian/rules EDITOR=true dch --preserve -v $VERSION-$PACKAGE_LEVEL -u low --create --package pw3270 sed -i "s@UNRELEASED@unstable@;s@Initial release. (Closes: #XXXXXX)@SVN Revision $PACKAGE_REVISION@" debian/changelog diff --git a/po/pt_BR.po b/po/pt_BR.po index a30bee0..a0facbd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-13 15:45-0300\n" +"POT-Creation-Date: 2012-09-13 16:59-0300\n" "PO-Revision-Date: 2012-09-05 09:05-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português do Brasil <>\n" diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index c2ccf2b..a597085 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -111,10 +111,10 @@ include sources.mak Release: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ install: Release - @$(MKDIR) $(DESTDIR)$(libdir) - @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir) - @$(LN_S) @DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@ - @$(LN_S) @DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@ + $(MKDIR) $(DESTDIR)$(libdir) + $(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir) + $(LN_S) @DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@ + $(LN_S) @DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@ Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 7cbd625..d82a77d 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -88,13 +88,13 @@ endif Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png - @$(MKDIR) $(DESTDIR)$(bindir) - @$(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir) + $(MKDIR) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir) - @$(MKDIR) $(DESTDIR)$(libdir) - @$(INSTALL_PROGRAM) $(BINRLS)/lib/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir) - @$(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@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)$(libdir) + $(INSTALL_PROGRAM) $(BINRLS)/lib/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir) + $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@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) @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) -- libgit2 0.21.2