Commits

Anonymous committed 272b1ef

Arrange to move tramp2 and compat files away if present.

Comments (0)

Files changed (1)

 # targets
 #
 
-.PHONY: extra-objects tramp2 compat
+.PHONY: extra-objects mvtramp2 mvcompat
 
-all::	tramp2 compat \
+all::	mvtramp2 mvcompat \
 	$(AUTOLOAD_PATH)/auto-autoloads.elc $(ELCS) \
 	$(AUTOLOAD_PATH)/custom-load.elc \
 	$(TEXI_DIR)/tramp.info \
 	extra-objects
 
-tramp2:
-	( cd lisp; \
-	  if [ ! -e tramp2 ]; then mkdir tramp2; fi; \
-	  mv tramp2*.el* tramp2/ \
-	)
+# Move hazmat out of the way.
+mvtramp2:
+	if [ ! -e lisp/_tramp2 ]; then mkdir lisp/_tramp2; fi; \
+	if [ -n "$(wildcard lisp/tramp2*.el*)" ]; then \
+	  mv lisp/tramp2*.el* lisp/_tramp2; \
+	fi
 
-compat:
-	( cd lisp; \
-	  if [ ! -e compat ]; then mkdir compat; fi; \
-	  mv base64.el* format-spec.el* compat/ \
-	)
+mvcompat:
+	if [ ! -e lisp/_compat ]; then mkdir lisp/_compat; fi; \
+	if [ -n "$(wildcard lisp/base64.el*)" ]; then \
+	  mv lisp/base64.el* lisp/_compat; \
+	fi; \
+	if [ -n "$(wildcard lisp/format-spec.el*)" ]; then \
+	  mv lisp/format-spec.el* lisp/_compat; \
+	fi
 
 # #### Bogosity, but what to do is not obvious.
 extra-objects: