Permalink
Browse files

use /usr/lib64 for 64-bit

  • Loading branch information...
1 parent 51e85b5 commit 9f0541dda472b353ed16855451c33e7740cb30f8 @dklayer dklayer committed Mar 20, 2012
Showing with 8 additions and 3 deletions.
  1. +4 −0 Makefile
  2. +4 −3 aftpd.spec.in
View
4 Makefile
@@ -26,7 +26,11 @@ LISP ?= mlisp
ROOT ?= /
prefix ?= $(ROOT)/usr
+ifeq ($(ARCH),x86_64)
+libdir ?= $(prefix)/lib64
+else
libdir ?= $(prefix)/lib
+endif
sbindir ?= $(prefix)/sbin
version := $(shell grep defvar..ftpd-version ftpd.cl | sed -e 's,.*"\([0-9.]*\)".*,\1,')
View
7 aftpd.spec.in
@@ -4,7 +4,7 @@ Version: __VERSION__
Release: %{release}
License: LLGPL
Group: System Environment/Daemons
-Prereq: chkconfig
+#Prereq: chkconfig
Requires: logrotate
URL: http://opensource.franz.com/aftpd/
Source0: %{name}-%{version}.tar.gz
@@ -29,7 +29,8 @@ make
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/usr/{sbin,lib}
+mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/aftpd-__VERSION__
make ROOT=$RPM_BUILD_ROOT install
# Need to re-make the aftpd symbolic link here so that rpm knows about it.
@@ -45,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
/etc/init.d/aftpd
-/usr/lib/aftpd
+%{_libdir}/aftpd
/usr/sbin/aftpd
%config(noreplace) /etc/aftpd.cl
%config(noreplace) /etc/logrotate.d/aftpd

0 comments on commit 9f0541d

Please sign in to comment.