summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2011-12-16 10:33:45 +0100
committerAchim Gratz <Stromeko@Stromeko.DE>2012-04-20 21:04:10 +0200
commit0081071a528892f92b62894146be4ba79a2d87a2 (patch)
treec7cc30e6fbc59d9464a8f6b0daf2c4e9e9c3301e
parent1e343f7f3bac8e1436f3b1fa5acfe7f8b2b5ccec (diff)
downloadorg-mode-0081071a528892f92b62894146be4ba79a2d87a2.tar.gz
create Makefile for etc/, some additions to .gitignore
* etc/Makefile: create, activate subdir "styles" for ODT exporter * .gitignore: ignore doc/git-describe.texi and .gitattributes
-rw-r--r--.gitignore2
-rw-r--r--etc/Makefile24
-rw-r--r--targets.mk4
3 files changed, 28 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index c878226..3504d1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,8 @@ manual
org_dual_license.texi
ORGWEBPAGE/Changes.txt
local*.mk
+doc/git-describe.texi
+.gitattributes
# aspell word and replacement lists
diff --git a/etc/Makefile b/etc/Makefile
new file mode 100644
index 0000000..c58d912
--- /dev/null
+++ b/etc/Makefile
@@ -0,0 +1,24 @@
+etcdir = $(lispdir)/etc
+ETCDIRS = styles
+-include local.mk # optional local customization
+
+.NOTPARALLEL: # always run this make serially
+.SUFFIXES: # we don't need default suffix rules
+ifeq ($(MAKELEVEL), 0)
+ $(error This make needs to be started as a sub-make from the toplevel directory.)
+endif
+
+.PHONY: all install clean cleanall clean-install
+
+all:
+
+install: $(ETCDIRS)
+ $(foreach dir, $?, if [ ! -d $(etcdir)/$(dir) ]; then $(MKDIR) $(etcdir)/$(dir); else true; fi ; $(CP) $(dir)/* $(etcdir)/$(dir); )
+
+clean:
+
+cleanall:
+
+clean-install:
+ if [ ! -d $(etcdir) ]; then $(MKDIR) $(etcdir); else true; fi ;
+ $(RMR) $(etcdir)
diff --git a/targets.mk b/targets.mk
index badb352..1979622 100644
--- a/targets.mk
+++ b/targets.mk
@@ -4,7 +4,7 @@ DISTFILES_extra= Makefile request-assign-future.txt contrib etc
.EXPORT_ALL_VARIABLES:
LISPDIRS = lisp
-SUBDIRS = doc $(LISPDIRS)
+SUBDIRS = doc etc $(LISPDIRS)
INSTSUB = $(SUBDIRS:%=install-%)
GITVERSION = $(shell git describe --abbrev=6 HEAD)
@@ -15,7 +15,7 @@ ifneq ("$(GITSTATUS)", "")
GITVERSION := $(GITVERSION).dirty
endif
-.PHONY: default all up2 update compile lisp doc \
+.PHONY: default all up2 update compile lisp doc etc \
install info html pdf card docs $(INSTSUB) \
autoloads cleanall clean cleancontrib cleanelc cleandoc cleanrel