Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/xfig-01-3.2.5b-Imakefile.diff
author jurikm
Sat, 18 Feb 2012 20:51:52 +0000
changeset 8256 41406db59024
parent 2511 e67fcf1a74dd
permissions -rw-r--r--
SFExfig.spec: small build cleanup
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8256
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
     1
 
--- xfig.3.2.5b/Imakefile	Sat Feb 18 20:49:21 2012
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
     2
 
+++ xfig.3.2.5b/Imakefile	Sat Feb 18 20:51:22 2012
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
     3
 
@@ -30,7 +30,7 @@
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
     4
 
 XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
     5
 
 XCOMM for it relative to the BINDIR variable.
2511
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
     6
 
 XCOMM
8256
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
     7
 
-XCOMM BINDIR = /usr/bin
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
     8
 
+BINDIR = /usr/bin
2511
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
     9
 
 XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
8256
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    10
 
 MKDIRHIER = mkdirhier
2511
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    11
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    12
 
@@ -60,7 +60,7 @@
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    13
 
 XCOMM some new features, including "Tips", which replace xfig's "help balloons"
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    14
 
 XCOMM NOTE: This is the default for many X systems now.
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    15
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    16
 
-XCOMM #define XAW3D1_5E
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    17
 
+#define XAW3D1_5E
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    18
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    19
 
 #ifdef XAW3D1_5E
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    20
 
     DUSEXAW3D = -DXAW3D -DXAW3D1_5E
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    21
 
@@ -119,8 +119,8 @@
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    22
 
 #define USEXPM_ICON
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    23
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    24
 
 #ifdef USEXPM
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    25
 
-XPMLIBDIR = /usr/local/lib
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    26
 
-XPMINC = -I/usr/local/include/X11
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    27
 
+XPMLIBDIR = /usr/lib
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    28
 
+XPMINC = -I/usr/X11/include/X11/
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    29
 
 #endif
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    30
e67fcf1a74dd all spec for xfig
dauphing
parents:
diff changeset 
    31
 
 XCOMM Uncomment the following definiton if you want to use the small icons
8256
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    32
 
@@ -172,13 +172,13 @@
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    33
 
 XFIGLIBDIR = $(LIBDIR)/xfig
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    34
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    35
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    36
 
-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    37
 
-XFIGDOCDIR = /usr/local/xfig/doc
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    38
 
+XFIGDOCDIR = /usr/share/doc/xfig
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    39
 
+XCOMM XFIGDOCDIR = /usr/local/xfig/doc
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    40
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    41
 
 XCOMM MANDIR tells where the standard man pages should go (no need to change it
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    42
 
 XCOMM if you want the man pages installed in the standard place on your system
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    43
 
 MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    44
 
-XCOMM MANDIR = /usr/local/xfig/man
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    45
 
+MANDIR = /usr/share/man/man1x
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    46
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    47
 
 XCOMM If your system doesn't have strstr undefine the following definition
41406db59024 SFExfig.spec: small build cleanup
jurikm
parents: 2511
diff changeset 
    48
 
 XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
upstream/spec-files-extra