Mercurial Mercurial > upstream > oracle > userland-gate / 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.
components/meld/patches/help-C-Makefile.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 227 1e1ccdc6b1e6
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
227
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     1
 
--- meld-1.4.0/help/C/Makefile	Sun Sep 26 15:25:02 2010
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     2
 
+++ meld-1.4.0/help/C/new.Makefile	Thu Apr 21 11:06:37 2011
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     3
 
@@ -2,12 +2,12 @@
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     4
 
 .SUFFIXES :
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     5
 
 include ../../INSTALL
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     6
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     7
 
-LANG := $(notdir $(CURDIR))
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     8
 
-XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(LANG)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     9
 
-OMF_NAME := meld-$(LANG).omf
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    10
 
+XLANG := $(notdir $(CURDIR))
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    11
 
+XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(XLANG)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    12
 
+OMF_NAME := meld-$(XLANG).omf
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    13
 
 OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    14
 
 OMF_STATE:= $(DESTDIR)$(localstatedir)/lib/scrollkeeper
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    15
 
-INST_XML := $(helpdir_)/$(LANG)/meld.xml
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    16
 
+INST_XML := $(helpdir_)/$(XLANG)/meld.xml
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    17
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    18
 
 .PHONY : all
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    19
 
 all $(OMF_NAME).install : $(OMF_NAME)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    20
 
@@ -16,8 +16,8 @@
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    21
 
 .PHONY : install
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    22
 
 install : $(OMF_NAME).install
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    23
 
 	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    24
 
-	install -m 644 meld.xml $(XML_DIR_)/meld.xml
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    25
 
-	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    26
 
+	ginstall -m 444 meld.xml $(XML_DIR_)/meld.xml
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    27
 
+	-ginstall -m 444 $< $(OMF_DIR_)/$(OMF_NAME)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    28
 
 	-scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    29
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    30
 
 .PHONY : uninstall
upstream/oracle/userland-gate