* [gentoo-commits] gentoo-x86 commit in dev-tcltk/iwidgets/files: 4.0.1-path.patch
@ 2010-12-07 19:56 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-12-07 19:56 UTC (permalink / raw
To: gentoo-commits
jlec 10/12/07 19:56:40
Added: 4.0.1-path.patch
Log:
Keep LFS layout, #295836
(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-tcltk/iwidgets/files/4.0.1-path.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/iwidgets/files/4.0.1-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/iwidgets/files/4.0.1-path.patch?rev=1.1&content-type=text/plain
Index: 4.0.1-path.patch
===================================================================
diff --git a/Makefile.in b/Makefile.in
index 381bfac..1ba8efb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,7 +48,9 @@ LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
# Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/usr/share/man/mann
+
+DATA_DIR = $(INSTALL_ROOT)$(prefix)/usr/share/iwidgets$(IWIDGETS_VERSION)
# Directory containing Tcl source code (for library used during test):
TCL_SRC_DIR = @TCL_SRC_DIR@
@@ -135,26 +137,26 @@ install-libraries:
done;
install-demos:
- @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
- @echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
+ @$(MKINSTALLDIRS) $(DATA_DIR)/demos/images $(DATA_DIR)/demos/html
+ @echo "Installing demos from $(srcdir)/demos into $(DATA_DIR)/demos"
@for i in $(srcdir)/demos/*; \
do \
if [ -f $$i ] ; then \
- $(INSTALL_SCRIPT) $$i $(SCRIPT_INSTALL_DIR)/demos; \
+ $(INSTALL_SCRIPT) $$i $(DATA_DIR)/demos; \
fi; \
done;
- @echo "Installing images from $(srcdir)/demos/images into $(SCRIPT_INSTALL_DIR)/demos/images"
+ @echo "Installing images from $(srcdir)/demos/images into $(DATA_DIR)/demos/images"
for i in $(srcdir)/demos/images/*; \
do \
if [ -f $$i ] ; then \
- $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
+ $(INSTALL_DATA) $$i $(DATA_DIR)/demos/images; \
fi; \
done;
- @echo "Installing html man pages from $(srcdir)/demos/html into $(SCRIPT_INSTALL_DIR)/demos/html"
+ @echo "Installing html man pages from $(srcdir)/demos/html into $(DATA_DIR)/demos/html"
for i in $(srcdir)/demos/html/*; \
do \
if [ -f $$i ] ; then \
- $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/html; \
+ $(INSTALL_DATA) $$i $(DATA_DIR)/demos/html; \
fi; \
done;
@@ -169,7 +171,6 @@ install-doc:
$$i > $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
chmod 444 $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
done;
- $(INSTALL_DATA) $(srcdir)/license.terms $(SCRIPT_INSTALL_DIR)
Makefile: $(srcdir)/Makefile.in
$(SHELL) config.status
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-tcltk/iwidgets/files: 4.0.1-path.patch
@ 2011-06-23 15:16 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2011-06-23 15:16 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/23 15:16:17
Modified: 4.0.1-path.patch
Log:
Don't install in /usr/usr #372587
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-tcltk/iwidgets/files/4.0.1-path.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/iwidgets/files/4.0.1-path.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/iwidgets/files/4.0.1-path.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/iwidgets/files/4.0.1-path.patch?r1=1.1&r2=1.2
Index: 4.0.1-path.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/files/4.0.1-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 4.0.1-path.patch 7 Dec 2010 19:56:40 -0000 1.1
+++ 4.0.1-path.patch 23 Jun 2011 15:16:17 -0000 1.2
@@ -1,19 +1,25 @@
-diff --git a/Makefile.in b/Makefile.in
-index 381bfac..1ba8efb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -48,7 +48,9 @@ LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+--- iwidgets4.0.1/Makefile.in
++++ iwidgets4.0.1/Makefile.in
+@@ -30,6 +30,7 @@
+
+ srcdir = @srcdir@
+ bindir = @bindir@
++mandir = @mandir@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -48,7 +49,9 @@
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
# Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
-+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/usr/share/man/mann
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)/mann
+
-+DATA_DIR = $(INSTALL_ROOT)$(prefix)/usr/share/iwidgets$(IWIDGETS_VERSION)
++DATA_DIR = $(INSTALL_ROOT)$(prefix)/share/iwidgets$(IWIDGETS_VERSION)
# Directory containing Tcl source code (for library used during test):
TCL_SRC_DIR = @TCL_SRC_DIR@
-@@ -135,26 +137,26 @@ install-libraries:
+@@ -135,26 +138,26 @@
done;
install-demos:
@@ -47,7 +53,7 @@
fi; \
done;
-@@ -169,7 +171,6 @@ install-doc:
+@@ -169,7 +172,6 @@
$$i > $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
chmod 444 $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
done;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-23 15:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07 19:56 [gentoo-commits] gentoo-x86 commit in dev-tcltk/iwidgets/files: 4.0.1-path.patch Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2011-06-23 15:16 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox