aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--etc/Makefile.am3
-rw-r--r--mpio.spec.in10
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 987e383..01ea342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-08 <mager@tzi.de>
+
+ * mpio.spec.in, etc/Makefile.am: fixed packaging problems
+
2003-02-21 <crunchy@tzi.de>
* libmpio/directory.h, libmpio/directory.c, libmpio/mpio.h,
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 445bf6b..0c83c3d 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,3 +1,4 @@
datadir=$(sysconfdir)/mpio
-data_DATA = mpioshrc \ No newline at end of file
+data_DATA = mpioshrc
+EXTRA_DIST = mpioshrc \ No newline at end of file
diff --git a/mpio.spec.in b/mpio.spec.in
index ce87e46..be662e2 100644
--- a/mpio.spec.in
+++ b/mpio.spec.in
@@ -3,6 +3,8 @@
%define release 1
%define name mpio
%define spec_path @SPEC_PATH@
+%define prefix /usr
+%define sysconfdir %prefix/etc
Version: %version
Summary: MPIO - providing access to MPIO mp3 players
@@ -11,7 +13,7 @@ Release: %release
Copyright: see COPYING
Group: Applications/MultiMedia
Source: http://download.sourceforge.net/mpio/mpio-@VERSION@.tar.gz
-Prefix: /usr
+Prefix: %prefix
Buildroot: /var/tmp/mpio-@VERSION@-buildroot/
Packager: Andreas Büsching <crunchy@tzi.de>
@@ -22,7 +24,7 @@ a userspace library and at the moment one tool to access the MPIO player.
%prep
%setup
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix -sysconfdir=%sysconfdir
%build
make
@@ -39,8 +41,8 @@ echo "%defattr(700,root,root)" >> /tmp/mpio-files.lst
echo "%prefix/sbin/mkmpiodev" >> /tmp/mpio-files.lst
echo "%defattr(644,root,root)" >> /tmp/mpio-files.lst
echo "/lib/modules/$KVERSION/%{spec_path}/mpio.o" >> /tmp/mpio-files.lst
-echo "%defattr(640,root,root)" >> /tmp/mpio-files.lst
-echo "/etc/mpio/mpioshrc" >> /tmp/mpio-files.lst
+echo "%defattr(644,root,root)" >> /tmp/mpio-files.lst
+echo "%sysconfdir/mpio/mpioshrc" >> /tmp/mpio-files.lst
make DESTDIR=$RPM_BUILD_ROOT install