Skip to content
This repository was archived by the owner on May 19, 2022. It is now read-only.

Commit cf83f2a

Browse files
author
Haeleth
committed
Yay, deb build now seems to work.
1 parent f4db581 commit cf83f2a

File tree

4 files changed

+14
-36
lines changed

4 files changed

+14
-36
lines changed

configure

+9-5
Original file line numberDiff line numberDiff line change
@@ -857,10 +857,11 @@ cat > Makefile <<_EOF
857857
#
858858
# Top-level makefile for Ponscripter
859859
860-
.PHONY: all install uninstall pclean clean distclean distdir dist deb rpm
860+
.PHONY: all install instaall-bin uninstall pclean clean \\
861+
distclean distdir dist deb rpm
861862
862863
export TARGET := ponscr$EXE
863-
export PREFIX ?= $PREFIX
864+
export PREFIX := $PREFIX
864865
export PATH := $OURPATH \$(PATH)
865866
export CFLAGS := $OURINCLUDE \$(CFLAGS)
866867
export CPPFLAGS := $OURINCLUDE \$(CPPFLAGS)
@@ -870,8 +871,10 @@ export LDFLAGS := $OURLDFLAGS \$(LDFLAGS)
870871
all:
871872
\$(MAKE) -C src all
872873
873-
install: all
874+
install-bin: all
874875
util/install-sh -c $STRIPFLAG src/\$(TARGET) \$(PREFIX)/bin/\$(TARGET)
876+
877+
install: install-bin
875878
util/install-man install \$(PREFIX) doc/*.[0-9]
876879
877880
uninstall:
@@ -893,7 +896,6 @@ distclean:
893896
894897
ponscripter.spec: ponscripter.spec.in util/pander-to-rpm-stupidity
895898
sed 's/^Version:/& $VERSION/' \$< > \$@
896-
util/pander-to-rpm-stupidity CHANGES >> \$@
897899
898900
DIST = ponscripter-$VERSION
899901
distdir: ponscripter.spec
@@ -914,7 +916,9 @@ dist: distdir
914916
915917
deb: distdir
916918
-svn export src/extlib \$(DIST)/src/extlib
917-
cd \$(DIST); dpkg-buildpackage
919+
mkdir \$(DIST)-deb
920+
mv \$(DIST) \$(DIST)-deb
921+
cd \$(DIST)-deb/\$(DIST) && dpkg-buildpackage
918922
919923
rpm: dist
920924
rpmbuild -ta \$(DIST).tar.bz2

debian/rules

+3-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ configure: configure-stamp
99

1010
configure-stamp:
1111
dh_testdir
12-
./configure --with-internal-libs
12+
./configure --with-internal-libs --prefix=debian/ponscripter/usr
1313
touch configure-stamp
1414

1515
build: build-stamp
@@ -28,10 +28,8 @@ clean:
2828
install: build
2929
dh_testdir
3030
dh_testroot
31-
dh_clean -k
32-
dh_installdirs
33-
mkdir -p $(CURDIR)/debian/testpack/usr/bin
34-
cp $(CURDIR)/src/ponscr $(CURDIR)/debian/testpack/usr/bin
31+
dh_clean -k
32+
$(MAKE) install-bin
3533

3634
binary-indep: build install
3735
binary-arch: build install
@@ -40,7 +38,6 @@ binary-arch: build install
4038
dh_installchangelogs CHANGES
4139
dh_installdocs README
4240
dh_installman doc/*.[0-9]
43-
dh_install --sourcedir=debian/testpack
4441
dh_strip
4542
dh_compress
4643
dh_fixperms

ponscripter.spec.in

+2
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@ rm -rf $RPM_BUILD_ROOT
4141
/usr/share/doc/ponscripter/*
4242

4343
%changelog
44+
* Sun Jan 18 2009 Peter Jolly <[email protected]>
45+
- Initial release

util/pander-to-rpm-stupidity

-25
This file was deleted.

0 commit comments

Comments
 (0)