Commit 3a930db7bccfb92bd6fe02125eebebd8905181f3
1 parent
75247e65
Exists in
master
and in
5 other branches
Corrigindo construção dos .deb
Showing
2 changed files
with
5 additions
and
6 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -149,7 +149,7 @@ $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib |
| 149 | 149 | |
| 150 | 150 | #---[ File lists ]------------------------------------------------------------- |
| 151 | 151 | |
| 152 | -filelist: debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install | |
| 152 | +filelist: debian/lib3270-dev.install debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install | |
| 153 | 153 | |
| 154 | 154 | debian/lib3270-dev.install: Makefile |
| 155 | 155 | @echo " GEN `basename $@`" |
| ... | ... | @@ -263,12 +263,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist |
| 263 | 263 | install: install-sdk install-lib install-app install-man |
| 264 | 264 | |
| 265 | 265 | install-app: install-locale |
| 266 | - @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install | |
| 266 | + @$(MAKE) DESTDIR=$(DESTDIR) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install | |
| 267 | 267 | @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui |
| 268 | 268 | @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui |
| 269 | 269 | |
| 270 | 270 | install-lib: |
| 271 | - @$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install | |
| 271 | + @$(MAKE) DESTDIR=$(DESTDIR) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install | |
| 272 | 272 | |
| 273 | 273 | locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) |
| 274 | 274 | |
| ... | ... | @@ -307,6 +307,7 @@ clean: |
| 307 | 307 | @rm -f $(PACKAGE_NAME).png |
| 308 | 308 | @rm -f $(PACKAGE_NAME)-logo.png |
| 309 | 309 | @rm -f *.log |
| 310 | + @rm -fr debian | |
| 310 | 311 | @echo "$@" |
| 311 | 312 | |
| 312 | 313 | cleanDebug: clean |
| ... | ... | @@ -314,7 +315,6 @@ cleanDebug: clean |
| 314 | 315 | |
| 315 | 316 | distclean: clean |
| 316 | 317 | @make -C src/pw3270 distclean |
| 317 | - @rm -f debian/*.install | |
| 318 | 318 | @rm -f src/pw3270/Makefile |
| 319 | 319 | @rm -f config.status |
| 320 | 320 | @rm -f src/lib3270/mkversion.sh |
| ... | ... | @@ -322,7 +322,6 @@ distclean: clean |
| 322 | 322 | @rm -f src/include/lib3270/config.h |
| 323 | 323 | @rm -f src/pw3270/uiparser/Makefile |
| 324 | 324 | @rm -fr autom4te.cache |
| 325 | - @rm -fr debian | |
| 326 | 325 | @rm -f *.pc |
| 327 | 326 | @rm -f $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar* |
| 328 | 327 | @find ./src -name "Makefile" -exec rm -f {} \; | ... | ... |
makedeb.sh
| ... | ... | @@ -10,7 +10,7 @@ mkdir debian |
| 10 | 10 | |
| 11 | 11 | echo 7 > debian/compat |
| 12 | 12 | cp debian.control debian/control |
| 13 | -cp debian.rules debian/control | |
| 13 | +cp debian.rules debian/rules | |
| 14 | 14 | |
| 15 | 15 | EDITOR=true dch --preserve -v $VERSION-$PACKAGE_LEVEL -u low --create --package pw3270 |
| 16 | 16 | sed -i "s@UNRELEASED@unstable@;s@Initial release. (Closes: #XXXXXX)@SVN Revision $PACKAGE_REVISION@" debian/changelog | ... | ... |