Commit 46e9f1f69ddc543699728f33aecfba174caf1b17
1 parent
29ef0ba7
Exists in
master
and in
5 other branches
Atualizando empacotamento
Showing
2 changed files
with
5 additions
and
4 deletions
Show diff stats
Makefile.in
... | ... | @@ -175,13 +175,13 @@ bz2: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 |
175 | 175 | rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 |
176 | 176 | ifneq ($(RPMBUILD),no) |
177 | 177 | @$(MKDIR) $(PWD)/$(TMPDIR)/rpmbuild |
178 | - @TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild rpmbuild -ta --clean $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 | |
178 | + @TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild $(RPMBUILD) --define="_sourcedir $(PWD)" -ba --clean $(PACKAGE_TARNAME).spec | |
179 | 179 | @rm -fr $(PWD)/$(TMPDIR)/rpmbuild |
180 | 180 | endif |
181 | 181 | |
182 | -srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz | |
182 | +srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 | |
183 | 183 | ifneq ($(RPMBUILD),no) |
184 | - @rpmbuild -ts $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz | |
184 | + @$(RPMBUILD) --define="_srcrpmdir $(PWD)" -bs $(PACKAGE_TARNAME).spec | |
185 | 185 | endif |
186 | 186 | |
187 | 187 | $(PACKAGE_NAME).po: $(TMPDIR)/$(PACKAGE_NAME).pot |
... | ... | @@ -202,7 +202,7 @@ pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png |
202 | 202 | |
203 | 203 | $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist |
204 | 204 | @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) |
205 | - @find src -name Makefile -exec rm -f {} \; | |
205 | +# @find src -name Makefile -exec rm -f {} \; | |
206 | 206 | @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) |
207 | 207 | @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) |
208 | 208 | @NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) | ... | ... |