aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshemminger <shemminger>2004-05-11 22:58:13 +0000
committershemminger <shemminger>2004-05-11 22:58:13 +0000
commit064717a4d7e47b47ba42e658abfd36acaa4a65d6 (patch)
treebe335f2b8dd0df24a3dae6f4997a444405717b49
parent113e87de0647d42b5c941ac567a022cb59214510 (diff)
downloadandroid_external_brctl-064717a4d7e47b47ba42e658abfd36acaa4a65d6.tar.gz
android_external_brctl-064717a4d7e47b47ba42e658abfd36acaa4a65d6.tar.bz2
android_external_brctl-064717a4d7e47b47ba42e658abfd36acaa4a65d6.zip
Fix install to work with RPM... Finally.
-rw-r--r--Makefile.in2
-rw-r--r--bridge-utils.spec12
2 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index aa2a34a..be1d3ad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,4 +30,4 @@ maintainer-clean: distclean
rm -f doc/Makefile
install:
- for x in $(SUBDIRS); do $(MAKE) -DDESTDIR=$(DESTDIR) $(MFLAGS) -C $$x install; done
+ for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x install; done
diff --git a/bridge-utils.spec b/bridge-utils.spec
index 9b395b3..ba230dd 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -39,7 +39,17 @@ CFLAGS="${RPM_OPT_FLAGS}" ./configure --prefix=/usr --mandir=%{_mandir}
make
%install
-make install
+rm -rf %{buildroot}
+
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_includedir}
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_mandir}/man8
+install -m755 brctl/brctl %{buildroot}%{_sbindir}
+gzip doc/brctl.8
+install -m 644 doc/brctl.8.gz %{buildroot}%{_mandir}/man8
+install -m 644 libbridge/libbridge.h %{buildroot}%{_includedir}
+install -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT