From debee921b88917c66485b1d82b1f6d216cc9a6e2 Mon Sep 17 00:00:00 2001 From: Stas Sergeev <stsp@users.sourceforge.net> Date: Tue, 17 Dec 2024 22:07:46 +0300 Subject: [PATCH] deb,rpmL switch to autoconf --- Makefile.conf.in | 1 + debian/control | 1 + debian/rules | 6 ------ dj64.spec.rpkg | 7 +++++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile.conf.in b/Makefile.conf.in index a61cc41b..1c6db06e 100644 --- a/Makefile.conf.in +++ b/Makefile.conf.in @@ -1,4 +1,5 @@ prefix := @prefix@ +exec_prefix := @exec_prefix@ libdir := @libdir@ datarootdir := @datarootdir@ diff --git a/debian/control b/debian/control index fd3e2bcb..87f412fd 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: binutils-i686-linux-gnu, universal-ctags, autoconf, + automake, pkgconf, libelf-dev, debhelper (>= 9~) diff --git a/debian/rules b/debian/rules index b9a8a5b2..4be0c9b7 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,3 @@ %: dh $@ --no-parallel - -override_dh_auto_build: - dh_auto_build $@ -- prefix=/usr - -override_dh_auto_install: - dh_auto_install $@ -- prefix=/usr diff --git a/dj64.spec.rpkg b/dj64.spec.rpkg index 5907a0a0..9c27a7e8 100644 --- a/dj64.spec.rpkg +++ b/dj64.spec.rpkg @@ -15,6 +15,7 @@ VCS: {{{ git_dir_vcs }}} Source0: {{{ git_dir_archive }}} BuildRequires: autoconf +BuildRequires: automake BuildRequires: make BuildRequires: sed BuildRequires: bash @@ -36,14 +37,16 @@ dj64 is a 64-bit djgpp-compatible dev suite. %end %build -make prefix=%{_prefix} +autoreconf -v -i +%configure +make %end %check %end %install -make install DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir} +make install DESTDIR=%{buildroot} %end