From a65dcdab33cbf493b88f4067a6557945bc6e03c4 Mon Sep 17 00:00:00 2001
From: Josip Rodin <joy>
Date: Sun, 17 Aug 2008 00:56:02 +0000
Subject: CD custom dependencies moved to the right place now

CVS version numbers

Makefile.common: 1.93 -> 1.94
---
 Makefile.common | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index 1997ec0d255..763ee690319 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -75,21 +75,9 @@ $(existing-SUBS-cleandest):
 
 # the rule for every wml file
 ifndef NOGENERICDEP
-ifeq "$(findstring /CD,$(CURDIR))" ""
-%.$(LANGUAGE).html : %.wml $(WMLRCDEP) \
-  $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml $(GETTEXTDEP)
+%.$(LANGUAGE).html : %.wml $(WMLRCDEP) $(GETTEXTDEP) \
+  $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
 	$(WML) $(<F)
-else
-ifeq "$(findstring /CD/vendors,$(CURDIR))" ""
-%.$(LANGUAGE).html : %.wml $(WMLRCDEP) \
-  $(TEMPLDIR)/cdimage.wml $(GETTEXTDEP)
-	$(WML) $(<F)
-else
-%.$(LANGUAGE).html : %.wml $(WMLRCDEP) \
-  $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml $(GETTEXTDEP)
-	$(WML) $(<F)
-endif
-endif
 ifeq "$(LANGUAGE)" "en"
 ifeq "$(findstring /international/,$(CURDIR)/)" ""
 	-$(WMLBASE)/../touch_translations.pl $(CURDIR)/$(<F) $(LANGUAGE)
-- 
cgit v1.2.3