From 25e9a9c1ab67a6ccaca0a8691488038d84032645 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Mon, 8 Aug 2016 22:19:43 +0200
Subject: [PATCH] revue du lien symbolique pour le Makefile

---
 Makefile      | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 base/Makefile | 49 +------------------------------------------------
 2 files changed, 49 insertions(+), 49 deletions(-)
 mode change 120000 => 100644 Makefile
 mode change 100644 => 120000 base/Makefile

diff --git a/Makefile b/Makefile
deleted file mode 120000
index abf765e..0000000
--- a/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-base/Makefile
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ea084b8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,48 @@
+all: rebuild-switch
+	date
+
+clean:
+	nix-collect-garbage -d --delete-older-than 15d
+
+clean-aggressive:
+	nix-collect-garbage -d --delete-older-than 1d
+
+clean-total:
+	nix-collect-garbage -d
+
+clean-log:
+	journalctl --vacuum-size=1G
+
+full-auto: submodules-update upgrade clean optimise
+
+optimise:
+	nix-store --optimise
+
+push: submodules-push
+	git push --all
+	git push --tags
+
+rebuild-switch:
+	nixos-rebuild switch --fallback  --show-trace
+
+store-repair:
+	nix-store --verify --check-contents --repair
+
+submodules-update:
+	#git submodule update --remote
+	git submodule foreach git co master
+	git submodule foreach git ff
+
+submodules-push:
+	git submodule foreach git push --all
+	git submodule foreach git push --tags
+
+submodules-tag:
+	git submodule foreach git tag -f "$$(date +%F)-$$(hostname -s)"
+
+tag: submodules-tag
+	git tag -f "$$(date +%F)-$$(hostname -s)"
+
+upgrade:
+	nixos-rebuild switch --upgrade --fallback --show-trace
+
diff --git a/base/Makefile b/base/Makefile
deleted file mode 100644
index ea084b8..0000000
--- a/base/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-all: rebuild-switch
-	date
-
-clean:
-	nix-collect-garbage -d --delete-older-than 15d
-
-clean-aggressive:
-	nix-collect-garbage -d --delete-older-than 1d
-
-clean-total:
-	nix-collect-garbage -d
-
-clean-log:
-	journalctl --vacuum-size=1G
-
-full-auto: submodules-update upgrade clean optimise
-
-optimise:
-	nix-store --optimise
-
-push: submodules-push
-	git push --all
-	git push --tags
-
-rebuild-switch:
-	nixos-rebuild switch --fallback  --show-trace
-
-store-repair:
-	nix-store --verify --check-contents --repair
-
-submodules-update:
-	#git submodule update --remote
-	git submodule foreach git co master
-	git submodule foreach git ff
-
-submodules-push:
-	git submodule foreach git push --all
-	git submodule foreach git push --tags
-
-submodules-tag:
-	git submodule foreach git tag -f "$$(date +%F)-$$(hostname -s)"
-
-tag: submodules-tag
-	git tag -f "$$(date +%F)-$$(hostname -s)"
-
-upgrade:
-	nixos-rebuild switch --upgrade --fallback --show-trace
-
diff --git a/base/Makefile b/base/Makefile
new file mode 120000
index 0000000..c63c5da
--- /dev/null
+++ b/base/Makefile
@@ -0,0 +1 @@
+/etc/nixos/base/Makefile
\ No newline at end of file