From ce14bf47a6e3198541709f03453cec185fbb0a6a Mon Sep 17 00:00:00 2001
From: Antoine Ginies <aginies@mandriva.com>
Date: Thu, 29 Jul 2004 15:54:44 +0000
Subject: some path fix, menu fix

---
 Makefile          | 4 ++--
 drakpxelinux.spec | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 64cd102..e7aa153 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@ clean:
 
 install: all
 #	$(MAKE) -C po $@
-	install -d $(RPM_BUILD_ROOT)/usr/{X11R6/bin/,share/drakpxelinux/}
-	install -s -m755 $(NAME).pl $(RPM_BUILD_ROOT)/usr/X11R6/bin/
+	install -d $(RPM_BUILD_ROOT)/usr/bin/,share/drakpxelinux/}
+	install -s -m755 $(NAME).pl $(RPM_BUILD_ROOT)/usr/bin/drakpxelinux
 #	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
 
 dis: clean
diff --git a/drakpxelinux.spec b/drakpxelinux.spec
index 58ac88f..c9dc259 100644
--- a/drakpxelinux.spec
+++ b/drakpxelinux.spec
@@ -30,7 +30,7 @@ make prefix=$RPM_BUILD_ROOT install
 #menu
 mkdir -p $RPM_BUILD_ROOT%{_menudir}
 cat >$RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
-?package(%{name}): command="/usr/X11R6/bin/%{name}" section="Configuration/Other" \
+?package(%{name}): command="/usr/bin/%{name}" section="Configuration/Other" \
 icon="configuration_section.xpm" needs="x11" title="Drakpxelinux" \
 longtitle="Mandrake Pxelinux configurator"
 EOF
@@ -50,9 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc default TODO COPYING
-%{_prefix}/X11R6/bin/*
-%{_datadir}/%{name}
-%{_menudir}/%{name}
+%{_bindir}/%{name}
+#%{_datadir}/%{name}*
+%{_menudir}/%{name}*
 
 %changelog
 * Thu Jul 29 2004 Antoine Ginies <aginies@mandrakesoft.com> 0.6.0-1mdk
-- 
cgit v1.2.1