OSSP CVS Repository

ossp - Difference in ossp-pkg/as/as-gui/Makefile.in versions 1.46 and 1.47
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [History] 

ossp-pkg/as/as-gui/Makefile.in 1.46 -> 1.47 

--- Makefile.in  2003/03/05 15:23:33     1.46
+++ Makefile.in  2003/03/05 20:24:52     1.47
@@ -37,6 +37,7 @@
 bindir          = @bindir@
 sbindir         = @sbindir@
 libdir          = @libdir@
+datadir         = @datadir@
 includedir      = @includedir@
 mandir          = @mandir@
 
@@ -131,13 +132,17 @@
         $(IDL) --c++-suffix=cpp $<
 endif
 
+# Special treatment for help panel class, which needs the $datadir variable
+as_helpanel.o: as_helpanel.cpp
+        $(CXX) -c -DTITRAQ_DOCDIR=\"$(datadir)\" $(CPPFLAGS) $(CXXFLAGS) $<
+
 as-gui.1: as-gui.pod
         VS=`$(SHTOOL) version -lc -dshort as_version.cpp`; \
         VL=`$(SHTOOL) version -lc -dlong as_version.cpp`; \
         D=`$(SHTOOL) version -lc -dlong as_version.cpp | sed -e 's;.*(;;' -e 's;).*;;'`; \
         $(POD2MAN) --quotes=none \
                --section=1 --center="AS Accounting System" \
-               --release="$$D" --date="asgui $$VS" as-gui.pod | \
+               --release="$$D" --date="as-gui $$VS" as-gui.pod | \
                sed -e "s;ASGUI_VERSION_STR;$$VL;" >as-gui.1
 
 as-gui.conf.5: as-gui.conf.pod
@@ -146,24 +151,28 @@
         D=`$(SHTOOL) version -lc -dlong as_version.cpp | sed -e 's;.*(;;' -e 's;).*;;'`; \
         $(POD2MAN) --quotes=none \
                --section=5 --center="AS Preferences File" \
-               --release="$$D" --date="asgui $$VS" as-gui.conf.pod | \
+               --release="$$D" --date="as-gui $$VS" as-gui.conf.pod | \
                sed -e "s;ASGUI_VERSION_STR;$$VL;" >as-gui.conf.5
 
 install: all
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
-#       $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
-#       $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man5
+        $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+        $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man5
+        $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)
         $(SHTOOL) install -c -s -m 755 as-gui $(DESTDIR)$(bindir)/as-gui
-#       $(SHTOOL) install -c -m 644 as-gui.1 $(DESTDIR)$(mandir)/man1/as-gui.1
-#       $(SHTOOL) install -c -m 644 as-gui.conf.5 $(DESTDIR)$(mandir)/man5/as-gui.conf.5
+        $(SHTOOL) install -c -m 644 as-gui.1 $(DESTDIR)$(mandir)/man1/as-gui.1
+        $(SHTOOL) install -c -m 644 as-gui.conf.5 $(DESTDIR)$(mandir)/man5/as-gui.conf.5
+        $(SHTOOL) install -c -m 644 as-gui.html $(DESTDIR)$(datadir)/as-gui.html
 
 uninstall:
-#       $(RM) $(DESTDIR)$(mandir)/man5/as-gui.conf.5
-#       $(RM) $(DESTDIR)$(mandir)/man1/as-gui.1
+        $(RM) $(DESTDIR)$(datadir)/as-gui.html
+        $(RM) $(DESTDIR)$(mandir)/man5/as-gui.conf.5
+        $(RM) $(DESTDIR)$(mandir)/man1/as-gui.1
         $(RM) $(DESTDIR)$(bindir)/as-gui
-#       $(RMDIR) $(DESTDIR)$(mandir)/man5 >/dev/null 2>&1 || $(TRUE)
-#       $(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
+        $(RMDIR) $(DESTDIR)$(datadir) >/dev/null 2>&1 || $(TRUE)
+        $(RMDIR) $(DESTDIR)$(mandir)/man5 >/dev/null 2>&1 || $(TRUE)
+        $(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
         $(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
         $(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
         $(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
@@ -173,7 +182,6 @@
 ifdef CORBABASE
         $(RM) $(IDL_OBJ)
 endif
-        $(RM) as-gui.conf.5 as-gui.1
         $(RM) as_gui_pcre.tab *.core
 
 distclean: clean

CVSTrac 2.0.1