Removed obsolete mkdirs from Makefile

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index cc27334d04f847bb877c3546f5cfa67c33b426c3..e8a3524d8333d23e7274a42b2af4b795930dde34 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -206,7 +206,7 @@ upgrade: install-exec install-doc
        @echo
 
 install-data:
-       @for i in messages network/spoolin ; do
+       @for i in messages ; do
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
        @for i in public_clients citadel_urlshorteners.rc \
@@ -220,9 +220,6 @@ install-data:
        fi
 
 install-data-new:
-       @for i in network/spoolin network/systems; do \
-               $(srcdir)/mkinstalldirs $(DESTDIR)$(RUN_DIR)/$$i; \
-       done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
        $(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
        $(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc
@@ -234,12 +231,11 @@ install-data-new:
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
        done
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
        -@if test -d $(DESTDIR)/etc/pam.d; then \
                echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
                $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
        fi
-       @for i in bio files images info userpics; do \
+       @for i in files; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
        done
 
@@ -271,7 +267,7 @@ install-doc-new:
        $(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-       @for i in bio files images info userpics; do \
+       @for i in files; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
        @for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 683b1c8f93aa0d6f49bd8f970d920c2ac277e3da..aa108c30cf5bdf41bf0928c2d75fc432e6b93517 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -35,7 +35,7 @@ extern "C" {
  */
 #define CITADEL        PACKAGE_STRING
 
-#define REV_LEVEL      920             // This version
+#define REV_LEVEL      921             // This version
 #define REV_MIN                591             // Oldest compatible database
 #define EXPORT_REV_MIN 760             // Oldest compatible export files
 #define LIBCITADEL_MIN 920             // Minimum required version of libcitadel

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index 420b2e71f7401da22085e7e16f9e4416e1811447..adb923882994665fdf53883134a02ebc672ccf77 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -22,64 +22,6 @@ CtxType CTX_ICALMETHOD = CTX_NONE;
 CtxType CTX_ICALTIME = CTX_NONE;
 CtxType CTX_ICALATTENDEE = CTX_NONE;
 CtxType CTX_ICALCONFLICT = CTX_NONE;
-#if 0
-void SortPregetMatter(HashList *Cals)
-{
-       disp_cal *Cal;
-       void *vCal;
-       const char *Key;
-        long KLen;
-       IcalEnumMap *SortMap[10];
-       IcalEnumMap *Map;
-       void *vSort;
-       const char *Next = NULL;
-       const StrBuf *SortVector;
-       StrBuf *SortBy;
-       int i = 0;
-       HashPos *It;
-
-       SortVector = SBSTR("ICALSortVec");
-       if (SortVector == NULL)
-               return;
-
-       for (i = 0; i < 10; i++) SortMap[i] = NULL;
-       SortBy = NewStrBuf();
-       while (StrBufExtract_NextToken(SortBy, SortVector, &Next, ':') > 0) {
-               GetHash(IcalComponentMap, SKEY(SortBy), &vSort);
-               Map = (IcalEnumMap*) vSort;
-               SortMap[i] = Map;
-               i++;
-               if (i > 9)
-                       break;
-       }
-
-       if (i == 0)
-               return;
-
-       switch (SortMap[i - 1]->map) {
-               /*      case */
-
-       default:
-               break;
-       }
-
-       It = GetNewHashPos(Cals, 0);
-       while (GetNextHashPos(Cals, It, &KLen, &Key, &vCal)) {
-               i = 0;
-               Cal = (disp_cal*) vCal;
-               Cal->Status = icalcomponent_get_status(Cal->cal);
-               Cal->SortBy = Cal->cal;
-               
-
-               while ((SortMap[i] != NULL) && 
-                      (Cal->SortBy != NULL)) 
-               {
-                       /****Cal->SortBy = icalcomponent_get_first_property(Cal->SortBy, SortMap[i++]->map); */
-               }
-       }
-}
-#endif
-
 
 void tmplput_ICalItem(StrBuf *Target, WCTemplputParams *TP)
 {