From: ellson <devnull@localhost>
Date: Mon, 4 Apr 2011 03:58:03 +0000 (+0000)
Subject: installing gvedit fixes
X-Git-Tag: LAST_LIBGRAPH~32^2~872
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=373abefb7c7b6da0d00fd5b1d18e3793f6a783fa;p=graphviz

installing gvedit fixes
---

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 9ea557a74..c4da2e90e 100644
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -5,6 +5,10 @@ SUBDIRS = ui images
 
 bin_PROGRAMS = gvedit
 
+gveditdir = $(pkgdatadir)/gvedit
+
+gvedit_DATA = attrs.txt
+
 gvedit_SOURCES = main.cpp csettings.cpp mainwindow.cpp imageviewer.cpp mdichild.cpp
 
 noinst_HEADERS = csettings.h imageviewer.h mainwindow.h mdichild.h ui_settings.h 
@@ -15,14 +19,12 @@ qMakefile: gvedit.pro
 gvedit: main.cpp csettings.cpp mainwindow.cpp imageviewer.cpp mdichild.cpp qMakefile
 	$(MAKE) -f qMakefile prefix=${prefix} exec_prefix=${exec_prefix}
 
-install-data-hook:
-	(cd $(DESTDIR)$(pkgdatadir)/gvedit; rm -f attrs.txt; $(LN_S) ../doc/infosrc/attrs attrs.txt;)
-
-uninstall-hook:
-	(cd $(DESTDIR)$(pkgdatadir)/gvedit; rm -f attrs.txt;)
+attrs.txt: $(top_srcdir)/doc/infosrc/attrs
+	cp $(top_srcdir)/doc/infosrc/attrs attrs.txt
 
 EXTRA_DIST = \
 	gvedit.pro.in gvedit.ncb gvedit.sln gvedit.vcproj gvedit.vcproj.RESEARCH.arif.user gvedit.vcproj.user \
 	mdi.pro mdi.qrc mdi.vcproj mdi.vcproj.RESEARCH.arif.user \
 	document1.png document2.png vc90.idb vc90.pdb
 
+DISTCLEAN = attrs.txt
diff --git a/configure.ac b/configure.ac
index 20b6a3987..1365e753b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3342,6 +3342,7 @@ echo "  jpeg:          $use_jpeg"
 echo "  sfdp:          $use_sfdp"
 echo "  shared:        $use_shared"
 echo "  static:        $use_static"
+echo "  qt:            $use_qt"
 echo ""
 echo "commands:"
 echo "  dot:           Yes (always enabled)"
@@ -3353,6 +3354,7 @@ echo "  gvpr:          Yes (always enabled)"
 echo "  gvmap:         Yes (always enabled)"
 echo "  lefty:         $use_lefty"
 echo "  smyrna:        $use_smyrna"
+echo "  gvedit:        $use_qt"
 echo ""
 echo "plugin libraries:"
 echo "  dot_layout:    Yes (always enabled)"
@@ -3372,7 +3374,6 @@ echo "  quartz:        $use_quartz"
 echo "  rsvg:          $use_rsvg"
 echo "  visio:         $use_visio"
 echo "  xlib:          $use_xlib"
-echo "  qt:            $use_qt"
 echo ""
 echo "language extensions:"
 echo "  gv_sharp:      $use_sharp"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 277c551bb..62eda2841 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,4 +16,4 @@ pdf_DATA = $(pdf)
 html_DATA = $(html)
 txt_DATA = $(txt)
 
-EXTRA_DIST = $(txt) $(pdf) $(html) schema/*.xml schema/*.xslt libguide/libguide.pdf
+EXTRA_DIST = $(txt) $(pdf) $(html) schema/*.xml schema/*.xslt libguide/libguide.pdf infosrc/*
diff --git a/graphviz.spec.in b/graphviz.spec.in
index 5e02a8566..ec637bc54 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -32,7 +32,7 @@ Prefix: /usr
 # Available features are:
 #    SHARP GHOSTSCRIPT GUILE _IO JAVA LUA OCAML ORTHO PERL PHP
 #    PYTHON RUBY R_LANG TCL IPSEPCOLA MYLIBGD PANGOCAIRO RSVG
-#    GLITZ SMYRNA DEVIL MING GDK_PIXBUF QT
+#    GLITZ SMYRNA DEVIL MING GDK_PIXBUF _QT
 
 # SuSE uses a different mechanism to generate BuildRequires
 # norootforbuild
@@ -114,7 +114,7 @@ BuildRequires: python python-devel
 BuildRequires: java-devel
 %define PHP 1
 BuildRequires: php-devel
-%define QT 1
+%define _QT 1
 BuildRequires: qt-devel
 %ifnarch ppc64
 %define SHARP 1
@@ -181,7 +181,9 @@ fi
 %{_bindir}/*
 %exclude %{_bindir}/diffimg
 %exclude %{_bindir}/dot_builtins
+%if 0%{?_QT}
 %exclude %{_bindir}/gvedit
+%endif
 %dir %{_libdir}/graphviz
 %{_libdir}/*.so.*
 %{_libdir}/graphviz/*.so.*
@@ -270,17 +272,19 @@ LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
 %endif
 
 #-- graphviz-qt rpm --------------------------------------------------
-%if 0%{?QT}
+%if 0%{?_QT}
 %package qt
 Group:            Applications/Multimedia
-Summary:          Graphviz applications using QT
+Summary:          Graphviz applications using _QT
 Requires:         graphviz = %{version}-%{release}
 
 %description qt
-Graphviz applications using QT - currently just gvedit
+Graphviz applications using _QT - currently just gvedit
 
 %files qt
+%defattr(-,root,root,-)
 %{_bindir}/gvedit
+%dir %{_datadir}/graphviz/gvedit
 %{_datadir}/graphviz/gvedit/*
 # %{_mandir}/man1/gvedit.1*
 %endif
@@ -605,9 +609,8 @@ CFLAGS="$RPM_OPT_FLAGS" \
 	--with%{!?IPSEPCOLA:out}-ipsepcola \
 	--with%{!?LASI:out}-lasi \
 	--with%{!?MING:out}-ming \
-	--with%{!?QT:out}-qt \
+	--with%{!?_QT:out}-qt \
 	--with%{!?PANGOCAIRO:out}-pangocairo \
-	--with%{!?QT:out}-qt \
 	--with%{!?RSVG:out}-rsvg \
 	--with%{!?ORTHO:out}-ortho \
 	--with%{!?SFDP:out}-sfdp \