unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
blob 53cfe0fa89c2a11479e514db162f833227475568 2584 bytes (raw)
name: gnu/packages/patches/artanis-fix-Makefile.in.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
 
Applies until an Artanis release comes with patches #9130 and #9131
applied.

diff -ru artanis-0.1.2/Makefile.in artanis-0.1.2.1/Makefile.in
--- artanis-0.1.2/Makefile.in	2016-02-10 12:35:18.800490571 -0200
+++ artanis-0.1.2.1/Makefile.in	2016-10-15 19:44:35.140907367 -0300
@@ -19,9 +19,18 @@
 MOD_OBJ := $(OBJ)/artanis
 BIN := bin
 TEMP_LIB_PATH := $(OBJ)
-MOD_PATH := $(shell guile -c "(display (%site-dir))")
 MOD_COMPILED_PATH := $(shell guile -c "(display (%site-ccache-dir))")
+
+ifdef DESTDIR
+INFO_DIR := $(DESTDIR)/share/info/
+MOD_PATH := $(DESTDIR)/$(shell guile -c "(display (%site-dir))")
 MOD_TARGET_PATH := $(DESTDIR)/$(MOD_COMPILED_PATH)
+else
+INFO_DIR := $(PREFIX)/share/info/
+MOD_PATH := $(shell guile -c "(display (%site-dir))")
+MOD_TARGET_PATH := $(MOD_COMPILED_PATH)
+endif
+
 GUILE_CFLAGS := -Wunsupported-warning -Wunbound-variable -Warity-mismatch -Wduplicate-case-datum -Wbad-case-datum -Wformat
 GUILEC := GUILE_LOAD_COMPILED_PATH=$(TEMP_LIB_PATH) guild compile $(GUILE_CFLAGS)
 ARTANIS_ETC := $(SRC)/etc/artanis
@@ -36,7 +45,6 @@
 GENDOCS :=$(BUILD_AUX)/gendocs.sh
 CHK_TEXINFO := $(BUILD_AUX)/check_texinfo.scm
 CP := cp -frd -P
-INFO_DIR := $(PREFIX)/share/info/
 TARBALL_NAME := artanis-$(VERSION)
 TMP_DIR := $(shell mktemp -d)
 ANN_GEN := $(BUILD_AUX)/announce-gen
@@ -124,18 +132,29 @@
 	-rm -f config.{h,log}
 
 install: $(ALL_TARGETS)
-	mkdir -p $(DESTDIR)/$(MOD_PATH)
-	$(CP) $(MOD) $(DESTDIR)/$(MOD_PATH)/
+	mkdir -p $(MOD_PATH)
+	$(CP) $(MOD) $(MOD_PATH)/
 	mkdir -p $(MOD_TARGET_PATH)/
 	$(CP) $(MOD_OBJ) $(MOD_TARGET_PATH)/
+
+ifdef DESTDIR
 	$(CP) $(ARTANIS_ETC) $(DESTDIR)/etc/
 	$(CP) $(ARTANIS_PAGES) $(DESTDIR)/etc/artanis/
-	mkdir -p $(DESTDIR)/$(PREFIX)/bin/
-	$(CP) $(BIN)/art $(DESTDIR)/$(PREFIX)/bin/
+	mkdir -p $(DESTDIR)/bin/
+	$(CP) $(BIN)/art $(DESTDIR)/bin/
 	mkdir -p $(DESTDIR)/etc/bash_completion.d/
 	$(CP) $(CMDCOMP) $(DESTDIR)/etc/bash_completion.d/
+else
+	$(CP) $(ARTANIS_ETC) $(PREFIX)/etc/
+	$(CP) $(ARTANIS_PAGES) $(PREFIX)/etc/artanis/
+	mkdir -p $(PREFIX)/bin/
+	$(CP) $(BIN)/art $(PREFIX)/bin/
+	mkdir -p $(PREFIX)/etc/bash_completion.d/
+	$(CP) $(CMDCOMP) $(PREFIX)/etc/bash_completion.d/
+endif
+
 	if [ -e /etc/bash.bashrc ]; then source /etc/bash.bashrc; fi
-	if [ -e artanis.info ]; then mkdir -p $(DESTDIR)/$(INFO_DIR); $(CP) artanis.info $(DESTDIR)/$(INFO_DIR)/; fi
+	if [ -e artanis.info ]; then mkdir -p $(INFO_DIR); $(CP) artanis.info $(INFO_DIR)/; fi
 
 distclean: distclean-mk clean clean-config clean-tarball
 	-rm -f $(BIN)/art

debug log:

solving d2c19f1 ...
found d2c19f1 in https://yhetil.org/guix-devel/1476582044.11070.21.camel@adfeno-VPCEG17FB/

applying [1/1] https://yhetil.org/guix-devel/1476582044.11070.21.camel@adfeno-VPCEG17FB/
diff --git a/gnu/packages/patches/artanis-fix-Makefile.in.patch b/gnu/packages/patches/artanis-fix-Makefile.in.patch\r
new file mode 100644\r
index 0000000..d2c19f1\r

1:7: trailing whitespace.
Applies until an Artanis release comes with patches #9130 and #9131\r
1:8: trailing whitespace.
applied.\r
1:9: trailing whitespace.
\r
1:10: trailing whitespace.
diff -ru artanis-0.1.2/Makefile.in artanis-0.1.2.1/Makefile.in\r
1:11: trailing whitespace.
--- artanis-0.1.2/Makefile.in	2016-02-10 12:35:18.800490571 -0200\r
Checking patch gnu/packages/patches/artanis-fix-Makefile.in.patch...
Applied patch gnu/packages/patches/artanis-fix-Makefile.in.patch cleanly.
warning: squelched 64 whitespace errors
warning: 69 lines add whitespace errors.

index at:
100644 53cfe0fa89c2a11479e514db162f833227475568	gnu/packages/patches/artanis-fix-Makefile.in.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).